[icinga-checkins] icinga.org: icinga-web/master: fix duplicated icinga.cronk. admin sql upgrade scripts (fixes #3328)

git at icinga.org git at icinga.org
Tue Nov 20 18:10:01 CET 2012


Module: icinga-web
Branch: master
Commit: b5b2b135ed297f490e8a9b6d5a3b9d5139b126cb
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=b5b2b135ed297f490e8a9b6d5a3b9d5139b126cb

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Tue Nov 20 18:08:10 2012 +0100

fix duplicated icinga.cronk.admin sql upgrade scripts (fixes #3328)

---

 .../updates/mysql/mysql_v1-7-2_to_v1-8-0.sql       |   11 +----------
 .../updates/oracle/oracle_v1-7-2_to_v1-8-0.sql     |   12 +-----------
 .../updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql       |   12 +-----------
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql b/etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql
index 6382e25..6119989 100644
--- a/etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql
+++ b/etc/schema/updates/mysql/mysql_v1-7-2_to_v1-8-0.sql
@@ -1,15 +1,6 @@
 DELETE FROM nsm_db_version;
 INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.8.0', NOW(), NOW());
 
-INSERT INTO nsm_target
-    (target_name,target_description,target_class,target_type) 
-VALUES (
-    'icinga.cronk.admin',
-    'Allow user edit and delete all cronks',
-    '',
-    'credential'
-);
-
 ALTER TABLE cronk
     ADD COLUMN cronk_system tinyint(1) DEFAULT 0;
 
@@ -53,4 +44,4 @@ INSERT INTO `nsm_target`
 );
 
 ALTER TABLE nsm_user
-    CHANGE COLUMN user_authid user_authid varchar(512) NULL DEFAULT NULL;
\ No newline at end of file
+    CHANGE COLUMN user_authid user_authid varchar(512) NULL DEFAULT NULL;
diff --git a/etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql b/etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql
index ea26128..d9818b7 100644
--- a/etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql
+++ b/etc/schema/updates/oracle/oracle_v1-7-2_to_v1-8-0.sql
@@ -3,16 +3,6 @@ define IXTBS='ICINGA_IDX1';
 DELETE FROM nsm_db_version;
 INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.8.0', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
 
-INSERT INTO nsm_target
-    (target_id, target_name,target_description,target_class,target_type)
-VALUES (
-    NSM_TARGET_seq.NEXTVAL,
-    'icinga.cronk.admin',
-    'Allow user edit and delete all cronks',
-    '',
-    'credential'
-);
-
 ALTER TABLE cronk
     ADD (cronk_system NUMBER(3) DEFAULT 0);
 
@@ -53,4 +43,4 @@ INSERT INTO nsm_target
         'icinga',
         'IcingaDataHostPrincipalTarget' );
 
-ALTER TABLE NSM_USER MODIFY ("USER_AUTHID" VARCHAR2(512 BYTE));
\ No newline at end of file
+ALTER TABLE NSM_USER MODIFY ("USER_AUTHID" VARCHAR2(512 BYTE));
diff --git a/etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql b/etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql
index 325718e..c0bf70d 100644
--- a/etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql
+++ b/etc/schema/updates/pgsql/pgsql_v1-7-2_to_v1-8-0.sql
@@ -3,16 +3,6 @@
 DELETE FROM nsm_db_version;
 INSERT INTO nsm_db_version VALUES ('1','icinga-web/v1.8.0', NOW(), NOW());
 
-INSERT INTO nsm_target
-    (target_name,target_description,target_class,target_type) 
-VALUES (
-    'icinga.cronk.admin',
-    'Allow user edit and delete all cronks',
-    '',
-    'credential'
-);
-
-
 ALTER TABLE cronk
     ADD COLUMN cronk_system boolean DEFAULT false;
 
@@ -54,4 +44,4 @@ INSERT INTO nsm_target
 );
 
 ALTER TABLE nsm_user
-    ALTER COLUMN user_authid TYPE varchar(512);
\ No newline at end of file
+    ALTER COLUMN user_authid TYPE varchar(512);





More information about the icinga-checkins mailing list