Changeset 7975

Timestamp:

2004-08-18T05:31:21+12:00 (20 years ago)

Author:

kjdon

Message:

added a few more args to mysql scripts

File:

• trunk/gsdl3/gs3-install.sh (modified) (3 diffs)

trunk/gsdl3/gs3-install.sh

@@ -83 +83 @@
 
 # copy the modified server.xml into tomcat
-cp ./tomcat/conf/server.xml ./tomcat/conf/server.xml.bak
-cat server.xml.in | sed "s|@gsdl3home@|${gsdl3home}|" > ./tomcat/conf/server.xml
-#edit the server.xml config file to set gsdl3home
-#if ! grep -q gsdl3 ./tomcat/conf/server.xml; then
-#    cat ./tomcat/conf/server.xml | sed "s,<\!-- Tomcat Root Context -->,<\!-- GSDL3 Service --><Context path=\"/gsdl3\" docBase=\"${gsdl3home}/web\" debug=\"1\" reloadable=\"true\"><Resources allowLinking='true'/></Context><\!-- Tomcat Root Context -->," > server.xml.tmp
-#    mv server.xml.tmp ./tomcat/conf/server.xml
-#fi
+if [ ! -f ./tomcat/conf/server-withexamples.xml.config]; then
+    mv ./tomcat/conf/server.xml ./tomcat/conf/server-withexamples.xml.config
+    cat server.xml.in | sed "s|@gsdl3home@|${gsdl3home}|" > ./tomcat/conf/server.xml
+fi
 
 # Edit the server.xml config file to set the port number
@@ -132 +129 @@
     
     ./scripts/mysql_install_db --datadir=./data --basedir=. --user=root --force
-    ./bin/mysqld_safe --user=root --datadir=./data --basedir=. --pid_file=gsdl3.pid --socket=/tmp/mysql.sock &
+    ./bin/mysqld_safe --user=root --datadir=./data --basedir=. --pid_file=gsdl3.pid --socket=/tmp/mysql.sock --err-log=./var/log/mysql.log &
     sleep 2
     ./bin/mysql --user=root --execute="GRANT SELECT,INSERT,DELETE,UPDATE,DROP,CREATE ON *.* TO gsdl3admin@localhost;"
@@ -142 +139 @@
     ./bin/mysql --user=root localsite_gs3mgdemo < $gsdl3home/web/sites/localsite/collect/gs3mgdemo/mysqldatadump.sql
 
-    ./bin/mysqladmin --user=root shutdown
+    ./bin/mysqladmin --user=root --socket=/tmp/mysql.sock shutdown
     cd  $gsdl3home
 fi