From 63163331adfda737e2806c314fc83d4a503605de Mon Sep 17 00:00:00 2001 From: Jeremy MANSON Date: Fri, 15 Jul 2016 11:15:54 +0200 Subject: [PATCH] configure nginx before compile guacamole --- scripts/install | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index d3955f9..14238b1 100644 --- a/scripts/install +++ b/scripts/install @@ -67,6 +67,9 @@ if [ -f $SRC_DIR/src_dep.lst ] sudo apt-get -y install `cat $SRC_DIR/src_dep.lst` -y -qq fi +# Modify Nginx configuration file and copy it to Nginx conf directory +sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf tar -xzf ../sources/guacamole-server-0.9.9.tar.gz -C $SRC_DIR @@ -88,15 +91,6 @@ sudo ln -s /etc/guacamole/guacamole.war /var/lib/jetty8/webapps/ sudo cp ../mysql-connector-java-5.1.38/mysql-connector-java-5.1.38-bin.jar /etc/guacamole/lib/ sudo cp ../guacamole-auth-jdbc-0.9.9/mysql/guacamole-auth-jdbc-mysql-0.9.9.jar /etc/guacamole/extensions/ sudo cp ../guacamole-auth-ldap-0.9.9/mysql/guacamole-auth-ldap-0.9.9.jar /etc/guacamole/extensions/ -## manual initialisation SQL (remove in the futur) -#mysql -u root -pMYSQLROOTPASSWORD -#create database guacamole_db; -#create user 'guacamole_user'@'localhost' identified by 'PASSWORD'; -#GRANT SELECT,INSERT,UPDATE,DELETE ON guacamole_db.* TO 'guacamole_user'@'localhost'; -#flush privileges; -#quit -#cat guacamole-auth-jdbc-0.9.9/mysql/schema/*.sql | mysql -u root -pMYSQLROOTPASSWORD guacamole_db - sudo rm -rf /usr/share/jetty8/.guacamole sudo ln -s /etc/guacamole /usr/share/jetty8/.guacamole @@ -115,9 +109,6 @@ sudo mv $SRC_DIR/guacamole.properties /etc/guacamole # Load initial SQL into the new database ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < "$SRC_DIR/guacamole-auth-jdbc-0.9.9/mysql/schema/001-create-schema.sql" ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < "$SRC_DIR/guacamole-auth-jdbc-0.9.9/mysql/schema/002-create-admin-user.sql" -# Modify Nginx configuration file and copy it to Nginx conf directory -sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf # clean cd