Changeset 10314


Ignore:
Timestamp:
2005-07-26T14:19:28+12:00 (19 years ago)
Author:
kjdon
Message:

small mysql windows changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/build.xml

    r10311 r10314  
    281281proxy.port=${proxy.port}
    282282mysql.installed.path=${mysql.installed.path} (this is the location of mysql if it is already installed)
    283 mysql.admin.user=${mysql.admin.user}
    284283mysql.port=${mysql.port}
    285284If these are not acceptable, please change them and rerun this target. Continue [y/n]?" />
    … …  
    708707    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
    709708      <arg value="--user=root"/>
    710       <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@localhost identified by 'greenstone';"/>
    711     </exec>
     709      <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@localhost identified by '${mysql.admin.password}';"/>
     710    </exec>
     711    <!--<exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
     712      <arg value="- -user=root"/>
     713      <arg value="- -execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@'%';"/>
     714    </exec>-->
    712715    <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
    713716      <arg value="--user=root"/>
    714       <arg value="--execute=GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@'%';"/>
    715     </exec>
    716     <exec executable="${mysql.home}/bin/mysql" dir="${mysql.home}">
    717       <arg value="--user=root"/>
    718       <arg value="--execute=GRANT SELECT ON *.* TO gsdl3reader@localhost identified by 'greenstone';"/>
     717      <arg value="--execute=GRANT SELECT ON *.* TO gsdl3reader@localhost identified by '${mysql.reader.password}';"/>
    719718    </exec>
    720719    <!-- load in the demo collection database -->
    … …  
    779778  </target>
    780779
    781     <target name="stop-mysql" depends="init" if="mysql.islocal"
     780    <target name="stop-mysql" depends="init,setup-mysql-root-password" if="mysql.islocal"
    782781    description="Shutdown only mysql">
    783     <echo>Shutting down the mysql server. At the prompt, enter the mysql root password.</echo>
     782    <echo>Shutting down the mysql server. At the password prompt (linux only), enter the mysql root password.</echo>
    784783    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
    785784      failonerror="true" os="${os.linux},{os.mac}">
    … …  
    789788      <arg value="shutdown"/>
    790789    </exec>
     790    <!-- on windows it doesn't work unless the password is specified here -->
    791791    <exec executable="${mysql.home}/bin/mysqladmin" dir="${mysql.home}"
    792792      failonerror="true" os="${os.windows}">
    793793      <arg value="--user=root"/>
    794       <arg value="-p"/>
     794      <arg value="-p${mysql.root.password}"/>
    795795      <arg value="shutdown"/>
    796796    </exec>
Note: See TracChangeset for help on using the changeset viewer.