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

Merge pull request #9 from ewilly/testing

Browse source 
Fix issues upload limit & language
This commit is contained in:
ewilly 2016-04-17 10:10:59 +02:00
commit cff7862c0a
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/nginx.conf
View file

@ -4,7 +4,7 @@ location YNH_EXAMPLE_PATH {
if ($scheme = http) { if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent; rewrite ^ https://$server_name$request_uri? permanent;
} }
client_max_body_size 10G; client_max_body_size YNH_FILE_SIZE;
index index.php; index index.php;
try_files $uri $uri/ index.php; try_files $uri $uri/ index.php;
@ -13,7 +13,7 @@ location YNH_EXAMPLE_PATH {
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm.sock;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param PHP_VALUE "upload_max_filesize = 2G \n post_max_size=2.1G"; fastcgi_param PHP_VALUE "upload_max_filesize = YNH_FILE_SIZE \n post_max_size=YNH_POST_SIZE";
fastcgi_param REMOTE_USER $remote_user; fastcgi_param REMOTE_USER $remote_user;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param SCRIPT_FILENAME $request_filename;

8
manifest.json
View file

@ -63,6 +63,14 @@
}, },
"choices": ["de","en","es","fr","it","nl","pl","pt","po","ro","ru"], "choices": ["de","en","es","fr","it","nl","pl","pt","po","ro","ru"],
"default": "en" "default": "en"
},
{
"name": "filesize",
"ask": {
"en": "Define the file upload size limit",
"fr": "Définissez la taille limite de téléchargement"
},
"default": "2G"
} }
] ]
} }

9
scripts/install
View file

@ -9,6 +9,7 @@ path=$2
admin=$3 admin=$3
is_public=$4 is_public=$4
default_lang=$5 default_lang=$5
filesize=$6
# definie useful vars # definie useful vars
app=bozon app=bozon
@ -54,7 +55,7 @@ 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
# configure config file # configure config file
sudo sed -i "s@'en'@'$default_lang'@g" $final_path/config.php sudo sed -i "s@default_language='en';@default_language='$default_lang';@g" $final_path/config.php
# create data folders # create data folders
sudo mkdir -p $final_path/private sudo mkdir -p $final_path/private
@ -67,6 +68,11 @@ sudo chown -R www-data: $data_path/uploads
sudo chown -R www-data: $data_path/thumbs sudo chown -R www-data: $data_path/thumbs
# configure nginx settings # configure nginx settings
## file upload size limit
postsize=$(echo "${filesize%?}.1${filesize: -1}")
sudo sed -i "s@YNH_FILE_SIZE@$filesize@g" ../conf/nginx.conf
sudo sed -i "s@YNH_POST_SIZE@$postsize@g" ../conf/nginx.conf
## path
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
@ -74,6 +80,7 @@ alias_path=$final_path
[ "$path" == '/' ] && alias_path=$alias_path'/' [ "$path" == '/' ] && alias_path=$alias_path'/'
sudo sed -i "s@YNH_EXAMPLE_ALIAS@$alias_path@g" ../conf/nginx.conf 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
# if app is private, remove url to SSOWat conf from skipped_uris # if app is private, remove url to SSOWat conf from skipped_uris