From 94afb6e2fcf6c3afeda33fc7f6a69d1538bf8bfc Mon Sep 17 00:00:00 2001
From: Jerome Sagnole <jean.sorgemoel@laposte.net>
Date: Tue, 5 Sep 2017 11:15:30 +0200
Subject: [PATCH] [docker server] move directory ryzom to khanat & ryzomweb to
 khanatweb

---
 .../server/debian/common/init-khanat.sh       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/dist/docker/server/debian/common/init-khanat.sh b/dist/docker/server/debian/common/init-khanat.sh
index f19a5298d..f261cdaf2 100755
--- a/dist/docker/server/debian/common/init-khanat.sh
+++ b/dist/docker/server/debian/common/init-khanat.sh
@@ -10,7 +10,7 @@ cd /opt; tar xzf ryzom-ressources.tar.gz || exit 2
 # configure environment
 cat << EOF > /opt/shard.sh
 export RYHOME=/home/gameserver
-export RYZOM_PATH=/home/gameserver/ryzom
+export RYZOM_PATH=/home/gameserver/khanat
 export PATH=\$PATH:/usr/local/bin:\$RYZOM_PATH/tools/scripts/linux
 export RYDATA=/home/gameserver/khanat-ressources
 export PATCH_HOME=/home/gameserver
@@ -20,7 +20,7 @@ EOF
 # configure environment
 cat << EOF > /home/gameserver/.bashrc
 export RYHOME=/home/gameserver
-export RYZOM_PATH=/home/gameserver/ryzom
+export RYZOM_PATH=/home/gameserver/khanat
 export PATH=\$PATH:/usr/local/bin:\$RYZOM_PATH/tools/scripts/linux
 export RYDATA=/home/gameserver/khanat-ressources
 export PATCH_HOME=/home/gameserver
@@ -56,15 +56,15 @@ sed -i -r 's/(DBHost)(.*)(=)(.*)(;)/DBHost = "localhost";/g' $RYZOM_PATH/server/
 sed -i -r 's/(DBRingName)(.*)(=)(.*)(;)/ DBRingName = "ring_mini01";/g' $RYZOM_PATH/server/sql.cfg || exit 2
 
 # install web ryzom
-cp -r /opt/code/web $RYZOM_PATH/ryzomweb || exit 2
+cp -r /opt/code/web $RYZOM_PATH/khanatweb || exit 2
 
-chmod -R a+w $RYZOM_PATH/ryzomweb || exit 2
-chown -R www-data:www-data $RYZOM_PATH/ryzomweb || exit 2
+chmod -R a+w $RYZOM_PATH/khanatweb || exit 2
+chown -R www-data:www-data $RYZOM_PATH/khanatweb || exit 2
 
 # configure apache
 cat << EOF >  /etc/apache2/sites-available/000-default.conf
 <VirtualHost *:80>
-	<Directory "$RYZOM_PATH/ryzomweb/">
+	<Directory "$RYZOM_PATH/khanatweb/">
 		Options Indexes FollowSymLinks
 		AllowOverride None
 		Require all granted
@@ -76,14 +76,14 @@ cat << EOF >  /etc/apache2/sites-available/000-default.conf
         ServerName lirria.khaganat.net
 
         ServerAdmin webmaster@localhost
-        DocumentRoot $RYZOM_PATH/ryzomweb/public_php/
+        DocumentRoot $RYZOM_PATH/khanatweb/public_php/
 
         ErrorLog \${APACHE_LOG_DIR}/error.log
         CustomLog \${APACHE_LOG_DIR}/access.log combined
 </VirtualHost>
 
 <VirtualHost *:40916>
-	<Directory "$RYZOM_PATH/ryzomweb/">
+	<Directory "$RYZOM_PATH/khanatweb/">
 		Options Indexes FollowSymLinks
 		AllowOverride None
 		Require all granted
@@ -91,7 +91,7 @@ cat << EOF >  /etc/apache2/sites-available/000-default.conf
         ServerName lirria.khaganat.net
 
         ServerAdmin admin@localhost
-        DocumentRoot $RYZOM_PATH/ryzomweb/public_php
+        DocumentRoot $RYZOM_PATH/khanatweb/public_php
 
         ErrorLog \${APACHE_LOG_DIR}/error.log
         CustomLog \${APACHE_LOG_DIR}/access.log combined
@@ -138,7 +138,7 @@ mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'shard'@'localhost' WITH GRANT
 
 ## DATABASE
 
-# launch web configuration for ryzom
+# launch web configuration for khanat
 #     -H 'Accept-Encoding: gzip, deflate' 
 curl 'http://localhost:40916/setup/install.php' \
      -H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' \
@@ -187,7 +187,7 @@ mysql -u root -e "use nel;
 INSERT INTO nel.shard (ShardId, domain_id, WsAddr, NbPlayers, Name, Online, Version, FixedSessionId, State, MOTD) VALUES ('302', '12', '$addressip:', '0', 'Lirria shard', '0', '', '0', 'ds_open', '');" || exit 2
 
 mysql -u root -e "use nel;
-INSERT INTO nel_tool.neltool_domains (domain_id, domain_name, domain_as_host, domain_as_port, domain_rrd_path, domain_las_admin_path, domain_las_local_path, domain_application, domain_sql_string, domain_hd_check, domain_mfs_web, domain_cs_sql_string) VALUES ('12', 'Lirria', '$addressip', '46700', '/home/gameserver/ryzom/server/save_shard/rrd_graphs', '', '', 'ryzom_open', '', '0', NULL, NULL);" || exit 2
+INSERT INTO nel_tool.neltool_domains (domain_id, domain_name, domain_as_host, domain_as_port, domain_rrd_path, domain_las_admin_path, domain_las_local_path, domain_application, domain_sql_string, domain_hd_check, domain_mfs_web, domain_cs_sql_string) VALUES ('12', 'Lirria', '$addressip', '46700', '/home/gameserver/khanat/server/save_shard/rrd_graphs', '', '', 'ryzom_open', '', '0', NULL, NULL);" || exit 2
 
 mysql -u root -e "use nel; 
 INSERT INTO nel_tool.neltool_shards (shard_id, shard_name, shard_as_id, shard_domain_id, shard_lang, shard_restart) VALUES ('302', 'open', 'open', '12', 'fr', '0');" || exit 2
@@ -297,7 +297,7 @@ ln -s /usr/local /home/gameserver/build
 cp /usr/local/sbin/* /usr/local/bin
 cat << EOF
 source /opt/shard.sh 
-/home/gameserver/ryzom/tools/scripts/linux/shard
+/home/gameserver/khanat/tools/scripts/linux/shard
 EOF
 
 cat << EOF > /opt/autostart.sh
@@ -311,7 +311,7 @@ tmp=\$(hostname -I)
 export addressip=\${tmp//[[:blank:]]/}
 sed -i -r 's/(FSListenHost)(.*)(=)(.*)(;)/FSListenHost = "'"\$addressip"'";/g' \$RYZOM_PATH/server/frontend_service.cfg || exit 2
 
-/home/gameserver/ryzom/tools/scripts/linux/shard start
+/home/gameserver/khanat/tools/scripts/linux/shard start
 EOF
 
 chmod +x /opt/autostart.sh