YunoHost-Apps/yourls_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/yourls_ynh.git synced 2024-09-03 20:35:59 +02:00
Code Issues Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
anmol26s 2017-07-21 01:47:59 +05:30 • committed by GitHub
commit 576add3bc5
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/nginx.conf
View file

@ -1,5 +1,6 @@
location LOCATIONTOCHANGE { location LOCATIONTOCHANGE {
alias ALIASTOCHANGE/; alias ALIASTOCHANGE/;
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
@ -7,9 +8,11 @@ location LOCATIONTOCHANGE {
try_files $uri $uri/ PATHTOCHANGE/yourls-loader.php; 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_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
@ -20,7 +23,6 @@ location LOCATIONTOCHANGE {
} }
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }

1
scripts/install
View file

@ -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" ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/activate_plugins.sql"
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf

2
scripts/upgrade
View file

@ -69,8 +69,6 @@ sudo chown root: $nginxconf
sudo chmod 600 $nginxconf sudo chmod 600 $nginxconf
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================