Show
Ignore:
Timestamp:
02.04.2012 19:35:14 (8 years ago)
Author:
ak19
Message:

Installer for GS3 now sets the admin password to user specification by calling the ant config-admin target in GS3's build.xml file.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r25156 r25329  
    1212 
    1313    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>    
    14     <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/> 
     14    <!--<typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstone3UserToDatabase" classpathref="project.classpath"/>--> 
    1515    <!-- if linux|mac --> 
    1616    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/> 
     
    337337    <target name="Configuring Administration Pages" if="enable.admin.pages"> 
    338338        <echo>Enabling Admin Pages</echo> 
    339         <!--<rsr file="${installDir}/etc/main.cfg" pattern="^\s*status\s+.*" replacement="status enabled"/>--> 
    340339        <rsr file="${installDir}/web/sites/localsite/siteConfig.xml" pattern="&lt;!--&lt;serviceRack name='Authentication'/&gt;--&gt;" replacement="&lt;serviceRack name='Authentication'/&gt;"/> 
    341         <echo>Creating admin and demo users</echo> 
    342         <adduser txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db" 
    343             usersDb="${installDir}/etc/users.gdb" 
     340        <echo>Creating admin user</echo> 
     341        <!--<echo>Creating admin and demo users</echo>--> 
     342        <exec dir="${installDir}" executable="cmd.exe"> 
     343          <arg line="/c echo ${admin.password}| ant config-admin"/> 
     344        </exec> 
     345        <!--<adduser txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB" 
     346            usersDb="${installDir}/web/sites/localsite/etc/usersDB" 
    344347            username="admin" 
    345348            password="${admin.password}" 
    346349            groups="administrator,colbuilder,all-collections-editor" 
    347             comment="created at install time"/> 
     350            comment="created at install time" 
     351            email=""/> 
    348352        <adduser 
    349             txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db" 
    350             usersDb="${installDir}/etc/users.gdb" 
     353            txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB" 
     354            usersDb="${installDir}/web/sites/localsite/etc/usersDB" 
    351355            username="demo" 
    352356            password="demo" 
    353357            groups="demo" 
    354             comment="Dummy 'demo' user with password 'demo' for authen-e collection"/> 
     358            comment="Dummy 'demo' user with password 'demo' for authen-e collection" 
     359            email=""/>--> 
    355360    </target> 
    356361