YunoHost-Apps/jappix_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jappix_ynh.git synced 2024-09-03 19:26:19 +02:00
Code Issues Activity Actions

Merge branch 'master' of https://github.com/titoko/jappix_ynh

Browse source
This commit is contained in:
titoko titoko 2013-12-11 21:23:48 +01:00
commit 89e151a8e5
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/nginx.conf
View file

@ -1,4 +1,4 @@
location PATHTOCHANGE/ { location PATHTOCHANGE {
alias ALIASTOCHANGE ; alias ALIASTOCHANGE ;
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
@ -14,7 +14,7 @@ location PATHTOCHANGE/ {
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
} }
} }
location PATHTOCHANGE/http-bind { location PATHTOCHANGE2/http-bind {
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }

11
scripts/install
View file

@ -11,9 +11,10 @@ exit 1
fi fi
# Remove trailing "/" for next commands # Remove trailing "/" for next commands
if [ ! $path -lt 2 ]; then
path=${path%/} path=${path%/}
fi
# Generate random DES key & password # Generate random DES key & password
deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') deskey=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p')
@ -30,6 +31,12 @@ db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]'
sudo chown -R www-data: $final_path sudo chown -R www-data: $final_path
# Modify Nginx configuration file and copy it to Nginx conf directory # Modify Nginx configuration file and copy it to Nginx conf directory
sudo sed -i "s@PATHTOCHANGE2@$path@g" ../conf/nginx.conf
if [ -z "$path" ]; then
path="/"
fi
sudo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sudo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf
sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sudo sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/jappix.conf