Changeset 19201 for release-kits/mark2

Timestamp:

2009-04-22T16:44:51+12:00 (15 years ago)

Author:

oranfry

Message:

installer pages asking if the user wants to enable the admin pages and if so asking for a password, plus the necessary ant targets to make it happen

Location:

release-kits/mark2/installer

Files:

• antinstall-config.xml (modified) (1 diff)
• build.xml (modified) (2 diffs)

release-kits/mark2/installer/antinstall-config.xml

@@ -78 +78 @@
 
     </page>
+
+    <page type="input" name="admin-pages" displayText="">
+        <comment name="admin-expl"/>
+        <comment name="admin-expl-2"/>
+        <comment name="admin-expl-3"/>
+        <checkbox property="enable.admin.pages" displayText="" defaultValue="false"/>
+    </page>
+
+    <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages">
+        <comment name="admin-password-expl"/>
+        <validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/>
+    </page>
+
     <!-- end binary release -->
 
-    <page type="input" name="admin-password" displayText="">
-        <comment name="admin-password-expl"/>
-<!--        <validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/>-->
-        <text property="admin.password" defaultValue="admin" displayText=""/>
-    </page>
 
     <page type="progress" name="progress" showTargets="true" displayText=""/>

release-kits/mark2/installer/build.xml

@@ -55 +55 @@
         <rsr file="${installDir}/cgi-bin/gliserver.pl" pattern="^#!.*" replacement="#!${perl.executable} -w" lines="1"/>
         <echo/>
-
-        <echo message="Creating admin and demo users"/>
-        <adduser txt2db="${installDir}/bin/darwin/txt2db"
-            usersDb="${installDir}/etc/users.gdb"
-            username="admin"
-            password="${admin.password}"
-            groups="administrator,colbuilder"
-            comment="created at install time"/>
-        <adduser
-            txt2db="${installDir}/bin/darwin/txt2db"
-            usersDb="${installDir}/etc/users.gdb"
-            username="demo"
-            password="demo"
-            groups="demo"
-            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
 
         <!-- delete unneeded files -->      
@@ -153 +138 @@
     </target>
 
+    <target name="Configuring Administration Pages" if="enable.admin.pages">
+        <echo>Enabling Admin Pages</echo>
+        <rsr file="${installDir}/etc/main.cfg" pattern="^\s*status\s+.*" replacement="status enabled"/>
+        <echo message="Creating admin and demo users"/>
+        <adduser txt2db="${installDir}/bin/darwin/txt2db"
+            usersDb="${installDir}/etc/users.gdb"
+            username="admin"
+            password="${admin.password}"
+            groups="administrator,colbuilder"
+            comment="created at install time"/>
+        <adduser
+            txt2db="${installDir}/bin/darwin/txt2db"
+            usersDb="${installDir}/etc/users.gdb"
+            username="demo"
+            password="demo"
+            groups="demo"
+            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
+    </target>