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

correction

Browse source
This commit is contained in:
ewilly 2016-03-24 20:10:52 +01:00
parent c99dfdc626
commit dda7b5fc64
2 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
conf/nginx.conf
View file

@ -18,6 +18,16 @@ location YNH_EXAMPLE_PATH {
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param SCRIPT_FILENAME $request_filename;
} }
location ~ (uploads|private|thumbs) {
deny all;
}
location ~ core {
deny all;
location ~* \.js$ {
allow all;
}
}
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }

37
scripts/install
View file

@ -32,25 +32,21 @@ sudo yunohost app setting $app is_public -v "$is_public"
sudo yunohost app setting $app domain -v "$domain" sudo yunohost app setting $app domain -v "$domain"
sudo yunohost app setting $app path -v "$path" sudo yunohost app setting $app path -v "$path"
#create path for copying # Create path for copying
final_path=/var/www/$app final_path=/var/www/$app
sudo mkdir -p $final_path sudo mkdir -p $final_path
data_path=/home/yunohost.app/$app
sudo mkdir -p $data_path
#copy files to final folder and set permissions # Copy files to final folder and set permissions
sudo cp -R ../sources/* $final_path/ sudo cp -R ../sources/* $final_path/
sudo find $final_path -type f -name ".htaccess" | xargs sudo rm sudo find $final_path -type f -name ".htaccess" | xargs sudo rm
#setup permissions
sudo chown -R root: $final_path sudo chown -R root: $final_path
sudo find $final_path -type f | xargs sudo chmod 644 sudo find $final_path -type f | xargs sudo chmod 644
sudo find $final_path -type d | xargs sudo chmod 755 sudo find $final_path -type d | xargs sudo chmod 755
sudo chown -R www-data: $data_path
sudo find $data_path -type f | xargs sudo chmod 644
sudo find $data_path -type d | xargs sudo chmod 755
#configure nginx settings # Configure config file
sudo sed -i "s@'en'@$default_lang'@g" $final_path/config.php
# Configure nginx settings
folder_path=${path%/} folder_path=${path%/}
sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" ../conf/nginx.conf sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" ../conf/nginx.conf
# If path is only / (without subfolder), add trailing slash to alias # If path is only / (without subfolder), add trailing slash to alias
@ -60,35 +56,30 @@ sudo sed -i "s@YNH_EXAMPLE_ALIAS@$alias_path@g" ../conf/nginx.conf
sudo sed -i "s@YNH_EXAMPLE_FOLDER@$folder_path@g" ../conf/nginx.conf sudo sed -i "s@YNH_EXAMPLE_FOLDER@$folder_path@g" ../conf/nginx.conf
sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
#temporary set public accessible # Temporary set public accessible
sudo yunohost app setting $app unprotected_uris -v "/" sudo yunohost app setting $app unprotected_uris -v "/"
# Restart services # Restart services
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf
#temporary add domain name to /etc/hosts # Temporary add domain name to /etc/hosts
sudo sed -i "1 i\127.0.0.1 $domain #bozon_hosts" /etc/hosts sudo sed -i "1 i\127.0.0.1 $domain #bozon_hosts" /etc/hosts
# Configure config file
sudo sed -i "s@'uploads/'@'/home/yunohost.app/$app/uploads/'@g" $final_path/config.php
sudo sed -i "s@'private/'@'/home/yunohost.app/$app/private/'@g" $final_path/config.php
#make request to install app #make request to install app
#get the html page #get the html page
curl_path=$([ "$path" == "/" ] || echo $path) #curl_path=$([ "$path" == "/" ] || echo $path)
#curl -kL -o install_page.html https://$domain$curl_path/index.php?p=admin >/dev/null 2>&1 #curl -kL -o install_page.html https://$domain$curl_path/index.php?p=admin >/dev/null 2>&1
#get the token for form validation #get the token for form validation
#token=$(cat install_page.html | grep "input" | grep "token" | tail -1 | cut -d' ' -f3 | cut -d'"' -f2) #token=$(cat install_page.html | grep "input" | grep "token" | tail -1 | cut -d' ' -f3 | cut -d'"' -f2)
#send http POST values #send http POST values
#curl -k -X POST \ curl -k -X POST \
--data-urlencode "login=$admin" \ --data-urlencode "login=$admin" \
--data-urlencode "pass=$password" \ --data-urlencode "pass=$password" \
--data-urlencode "confirm=$password" \ --data-urlencode "confirm=$password" \
--data-urlencode "token=$token" \ https://$domain$curl_path/index.php?p=login > /dev/null 2>&1
https://$domain$curl_path/index.php?p=admin > /dev/null 2>&1
#remove domain name from /etc/hosts #remove domain name from /etc/hosts
sudo sed -i "/#bozon_hosts/d" /etc/hosts sudo sed -i "/#bozon_hosts/d" /etc/hosts
@ -99,11 +90,11 @@ then
sudo yunohost app setting $app unprotected_uris -d sudo yunohost app setting $app unprotected_uris -d
fi fi
#adding admin to the allowed users # Adding admin to the allowed users
sudo yunohost app addaccess $app -u $admin sudo yunohost app addaccess $app -u $admin
#allow only allowed users to access admin panel # Allow only allowed users to access admin panel
#sudo yunohost app setting bozon protected_uris -v "/core/admin/" sudo yunohost app setting bozon protected_uris -v "index.php?p=login"
# Restart services # Restart services
sudo service nginx reload sudo service nginx reload