diff --git a/conf/nginx.conf b/conf/nginx.conf index bdfffa2..7a9b57c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,6 @@ location LOCATIONTOCHANGE { - alias ALIASTOCHANGE/; + alias ALIASTOCHANGE/; + if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; @@ -7,9 +8,11 @@ location LOCATIONTOCHANGE { try_files $uri $uri/ PATHTOCHANGE/yourls-loader.php; - index index.php index.html index.htm; - location ~ [^/]\.php(/|$) { + index index.php index.html index.htm; + + + location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_index index.php; @@ -20,7 +23,6 @@ location LOCATIONTOCHANGE { } - # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/scripts/install b/scripts/install index bbaa9b2..c45ae72 100644 --- a/scripts/install +++ b/scripts/install @@ -115,6 +115,5 @@ curl -kL -X POST https://$domain$path_url/admin/install.php --data "install=dumm ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/activate_plugins.sql" - sudo service nginx reload sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index 8d61600..8cd2b38 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,8 +69,6 @@ sudo chown root: $nginxconf sudo chmod 600 $nginxconf - - #================================================= # SETUP SSOWAT #=================================================