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

fix dependancies and path must be root

Browse source
This commit is contained in:
mbugeia 2016-10-26 00:28:51 +02:00
parent fc7b3eb3d9
commit 2c0f85715b
4 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/nginx.conf
View file

@ -1,5 +1,4 @@
location PATHTOCHANGE/ { location / {
COMMENT_IF_ROOTrewrite ^PATHTOCHANGE$ PATHTOCHANGE/ permanent;
proxy_pass http://localhost:7777/; proxy_pass http://localhost:7777/;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_buffering off; proxy_buffering off;

8
manifest.json
View file

@ -35,11 +35,11 @@
"name": "path", "name": "path",
"type": "path", "type": "path",
"ask": { "ask": {
"en": "Choose a path for Haste", "en": "Choose a path for Haste, only root works for now.",
"fr": "Choisissez un chemin pour Haste" "fr": "Choisissez un chemin pour Haste, seul la racine fonctionne."
}, },
"example": "/example", "example": "/",
"default": "/example" "default": "/"
}, },
{ {
"name": "is_public", "name": "is_public",

11
scripts/_common.sh
View file

@ -23,9 +23,10 @@ source /usr/share/yunohost/helpers
# #
check_or_install_npm() { check_or_install_npm() {
if ! dpkg -s npm | grep "installed" > /dev/null 2>&1; then if ! dpkg -s npm | grep "installed" > /dev/null 2>&1 \
|| dpkg -s nodejs-legacy | grep "installed" > /dev/null 2>&1; then
sudo apt-get update sudo apt-get update
sudo apt-get install -y npm sudo apt-get install -y npm nodejs-legacy
fi fi
} }
@ -99,12 +100,6 @@ install_haste() {
# Modify Nginx configuration file and copy it to Nginx conf directory # Modify Nginx configuration file and copy it to Nginx conf directory
sed -i "s@PATHTOCHANGE@${YNH_PATH%/}@g" ../conf/nginx.conf sed -i "s@PATHTOCHANGE@${YNH_PATH%/}@g" ../conf/nginx.conf
if [ "$path" = "/" ]
then
sed -i "s@COMMENT_IF_ROOT@#@g" ../conf/nginx.conf
else
sed -i "s@COMMENT_IF_ROOT@@g" ../conf/nginx.conf
fi
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 public, add url to SSOWat conf as skipped_uris # If app is public, add url to SSOWat conf as skipped_uris

5
scripts/install
View file

@ -15,6 +15,11 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
sudo yunohost app checkurl "${domain}${path}" -a "$app" \ sudo yunohost app checkurl "${domain}${path}" -a "$app" \
|| ynh_die "Path not available: ${domain}${path}" || ynh_die "Path not available: ${domain}${path}"
if ! [ "$path" = "/" ]
then
ynh_die "Path must be /"
fi
# Save app settings # Save app settings
ynh_app_setting_set "$app" is_public "$is_public" ynh_app_setting_set "$app" is_public "$is_public"