From ae11d16db998c044e523030cc026b2d0c0bc981b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 16 Mar 2004 06:43:15 +0000
Subject: initial (hopefully rather unobtrusive) patch

---
 rt/sbin/rt-setup-database | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'rt/sbin')

diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 58f882f6e..83e08270a 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -110,6 +110,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} );
 }
-- 
cgit v1.2.1


From ce41102169513f44c89a1e9bddfb250b29f239bb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:00:05 +0000
Subject: beginning of RT integration

---
 rt/sbin/rt-setup-database    | 4 ++++
 rt/sbin/rt-setup-database.in | 7 +++++++
 2 files changed, 11 insertions(+)

(limited to 'rt/sbin')

diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 83e08270a..434e68671 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -592,6 +592,10 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
+                insert_initial 
+                        Insert RT's core system objects
+                insert_initial 
+                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 9e990e5b8..f37c69dc7 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -110,6 +110,9 @@ elsif ( $args{'action'} eq 'drop' ) {
     }
     drop_db();
 }
+elsif ( $args{'action'} eq 'insert_initial' ) {
+    insert_initial_data();
+}
 elsif ( $args{'action'} eq 'insert' ) {
     insert_data( $args{'datafile'} );
 }
@@ -589,6 +592,10 @@ $0: Set up RT's database
 --action        init    Initialize the database
                 drop    Drop the database. 
                         This will ERASE ALL YOUR DATA
+                insert_initial 
+                        Insert RT's core system objects
+                insert_initial 
+                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
-- 
cgit v1.2.1


From b57bf99761751466c5b9a5d35df9e00b407c6f64 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 8 Apr 2004 12:05:04 +0000
Subject: remove accidentally doubled lines in usage inst

---
 rt/sbin/rt-setup-database    | 2 --
 rt/sbin/rt-setup-database.in | 2 --
 2 files changed, 4 deletions(-)

(limited to 'rt/sbin')

diff --git a/rt/sbin/rt-setup-database b/rt/sbin/rt-setup-database
index 434e68671..17819886c 100644
--- a/rt/sbin/rt-setup-database
+++ b/rt/sbin/rt-setup-database
@@ -594,8 +594,6 @@ $0: Set up RT's database
                         This will ERASE ALL YOUR DATA
                 insert_initial 
                         Insert RT's core system objects
-                insert_initial 
-                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index f37c69dc7..56f4e8763 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -594,8 +594,6 @@ $0: Set up RT's database
                         This will ERASE ALL YOUR DATA
                 insert_initial 
                         Insert RT's core system objects
-                insert_initial 
-                        Insert RT's core system objects
                 insert  Insert data into RT's database. 
                         By default, will use RT's installation data.
                         To use a local or supplementary datafile, specify it
-- 
cgit v1.2.1


From 70bfab976b302a8a407f7e921610983d9ac54ebd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 11 Nov 2004 12:18:12 +0000
Subject: merge in changes to rt-setup-database

---
 rt/sbin/rt-setup-database.in | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'rt/sbin')

diff --git a/rt/sbin/rt-setup-database.in b/rt/sbin/rt-setup-database.in
index 56f4e8763..0b9a1071a 100644
--- a/rt/sbin/rt-setup-database.in
+++ b/rt/sbin/rt-setup-database.in
@@ -453,6 +453,8 @@ sub insert_data {
                   $princ->LoadUserDefinedGroup( $item->{'GroupId'} );
 	        } elsif ($item->{'GroupDomain'} eq 'SystemInternal') {
                   $princ->LoadSystemInternalGroup( $item->{'GroupType'} );
+	        } elsif ($item->{'GroupDomain'} eq 'RT::System-Role') {
+                  $princ->LoadSystemRoleGroup( $item->{'GroupType'} );
 	        } elsif ($item->{'GroupDomain'} eq 'RT::Queue-Role' &&
 			 $item->{'Queue'}) {
                   $princ->LoadQueueRoleGroup( Type => $item->{'GroupType'},
-- 
cgit v1.2.1