Browse Source

Fix install php interface

Julien VAUBOURG 10 years ago
parent
commit
2fed2981cd
2 changed files with 6 additions and 3 deletions
  1. 4 1
      scripts/install
  2. 2 2
      sources/config.php

+ 4 - 1
scripts/install

@@ -79,12 +79,15 @@ sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /etc/nginx/conf.d/${domain}.d
 sudo sed 's|<TPL:NGINX_REALPATH>|/var/www/vpnadmin/|g' -i /etc/nginx/conf.d/${domain}.d/vpnadmin.conf
 sudo sed 's|<TPL:PHP_NAME>|vpnadmin|g' -i /etc/nginx/conf.d/${domain}.d/vpnadmin.conf
 
-# php-fpm
+## php-fpm
 sudo sed 's|<TPL:PHP_NAME>|vpnadmin|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:PHP_USER>|vpnadmin|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:PHP_GROUP>|vpnadmin|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 sudo sed 's|<TPL:NGINX_REALPATH>|/var/www/vpnadmin/|g' -i /etc/php5/fpm/pool.d/vpnadmin.conf
 
+# Fix sources
+sudo sed "s|<TPL:NGINX_LOCATION>|${url_path}|g" -i /var/www/vpnadmin/config.php
+
 # Copy init script
 sudo install -b -o root -g root -m 0755 ../conf/init_ynh-vpnclient /etc/init.d/ynh-vpnclient
 

+ 2 - 2
sources/config.php

@@ -4,9 +4,9 @@
 function configure() {
     option('env', ENV_PRODUCTION);
     option('debug', false);
-    option('base_uri', '/');
+    option('base_uri', '<TPL:NGINX_LOCATION>/');
     layout("layout.html.php");
-    define('PUBLIC_DIR', '/public');
+    define('PUBLIC_DIR', '<TPL:NGINX_LOCATION>/public');
 }
 
 // Not found page