fix install

Author: julienmalik

conf/nginx.conf

@@ -1,13 +1,9 @@
-location /YNH_PATH {
-       alias /var/www/openid/ ;
+location YNH_PATH {
+       alias /var/www/openidldap/ ;
        if ($scheme = http) {
            rewrite ^ https://$server_name$request_uri? permanent;
        }
        index index.php;
-       #try_files $uri $uri/ /YNH_PATH/index.php?user=$uri&$args;
-       #try_files $uri $uri/ index.php;
-       #location ~ [^/]\.php(/|$) {
-       
        location ~* .php$ {
            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
            fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -17,4 +13,4 @@ location /YNH_PATH {
            fastcgi_param PATH_INFO   $fastcgi_path_info;
        }
 }
-rewrite ^/YNH_PATH/([A-Za-z0-9]+)$ https://$server_name/YNH_PATH/index.php?user=$1 break;
+rewrite ^YNH_PATH/([A-Za-z0-9]+)$ https://$server_nameYNH_PATH/index.php?user=$1 break;

scripts/install

@@ -5,13 +5,13 @@ domain=$1
 path=$2
 
 # Check domain/path availability
-sudo yunohost app checkurl $domain$path -a openid
+sudo yunohost app checkurl $domain$path -a openidldap
 if [[ ! $? -eq 0 ]]; then
   exit 1
 fi
 
 # Copy files to the right place
-final_path=/var/www/openid
+final_path=/var/www/openidldap
 
 # owner=julienmalik
 # repo=openid-ldap
@@ -25,20 +25,20 @@ sudo cp -a ../sources/* $final_path
 
 # Extract default language and timezone that will be provided unless they are by LDAP
 ynh_lang=sudo bash -c "echo $LANG | cut -d '_' -f 1"
-sudo sed -i "s/YNH_DFT_LANG/$ynh_lang/g" $final_path/ldap.php
-ynh_timezone=`cat /etc/timezone`
-sudo sed -i "s/YNH_DFT_TIMEZONE/$ynh_timezone/g" $final_path/ldap.php
+sudo sed -i "s@YNH_DFT_LANG@$ynh_lang@g" $final_path/ldap.php
+ynh_timezone=$(cat /etc/timezone)
+sudo sed -i "s@YNH_DFT_TIMEZONE@$ynh_timezone@g" $final_path/ldap.php
 
 # Nginx config
 sudo sed -i "s@YNH_PATH@$path@g" ../conf/nginx.conf
-sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/openid.conf
+sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/openidldap.conf
 
 # Init log file
-sudo rm -f /var/log/openid
-sudo touch /var/log/openid
-sudo chown www-data: /var/log/openid
+sudo rm -f /var/log/openidldap
+sudo touch /var/log/openidldap
+sudo chown www-data: /var/log/openidldap
 
 # Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload
-sudo yunohost app setting openid skipped_uris -v "/"
+sudo yunohost app setting openidldap skipped_uris -v "/"
 sudo yunohost app ssowatconf

scripts/remove

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 domain=$(sudo yunohost app setting openid domain)
-sudo rm -f /etc/nginx/conf.d/$domain.d/openid.conf
+sudo rm -f /etc/nginx/conf.d/$domain.d/openidldap.conf
 
-sudo rm -rf /var/www/openid
-sudo rm -f /var/log/openid
+sudo rm -rf /var/www/openidldap
+sudo rm -f /var/log/openidldap
 
 sudo service nginx reload
 sudo yunohost app ssowatconf