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

Remove the possibility to install in path, not supported upstream

Browse source 
from an irc conv on #diaspora:

17:38 <autra>  hi! Can I run diaspora on a context_path, meaning on https://domain.tld/diaspora for instance? Or can I only do it on diaspora.domain.tld?
17:46 <jhass> unfortunately only the latter is really supported
This commit is contained in:
Augustin Trancart 2020-05-03 13:36:48 +02:00
parent fc428b360d
commit 16d1654d13
5 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
check_process
View file

@ -6,7 +6,7 @@
admin_password="pass" admin_password="pass"
; Checks ; Checks
pkg_linter=1 pkg_linter=1
setup_sub_dir=1 setup_sub_dir=0 # not supported upstream
setup_root=1 setup_root=1
setup_nourl=0 setup_nourl=0
setup_public=1 setup_public=1

2
conf/diaspora.yml
View file

@ -36,7 +36,7 @@ configuration: ## Section
## However changing http to https is okay and has no consequences. ## However changing http to https is okay and has no consequences.
## If you do change the URL, you will have to start again as the URL ## If you do change the URL, you will have to start again as the URL
## will be hardcoded into the database. ## will be hardcoded into the database.
url: "https://{{ domain }}{{ path_url }}" url: "https://{{ domain }}"
## Set the bundle of certificate authorities (CA) certificates. ## Set the bundle of certificate authorities (CA) certificates.
## This is specific to your operating system. ## This is specific to your operating system.

4
conf/nginx.conf
View file

@ -1,5 +1,5 @@
# Proxy if requested file not found # Proxy if requested file not found
location __PATH__ { location / {
root __FINALPATH__/diaspora/public; root __FINALPATH__/diaspora/public;
@ -11,7 +11,7 @@ location __PATH__ {
# Proxy if requested file not found # Proxy if requested file not found
try_files $uri @diaspora; try_files $uri @diaspora;
location __PATH__/assets/ { location /assets/ {
expires max; expires max;
more_set_headers 'Cache-Control: public'; more_set_headers 'Cache-Control: public';
} }

14
manifest.json
View file

@ -27,21 +27,11 @@
"name": "domain", "name": "domain",
"type": "domain", "type": "domain",
"ask": { "ask": {
"en": "Choose a domain for diaspora*", "en": "Choose a domain for diaspora* (it needs its own domain)",
"fr": "Choisissez un domaine pour diaspora*" "fr": "Choisissez un domaine pour diaspora* (diaspora* a besoin de son propre domaine)"
}, },
"example": "domain.org" "example": "domain.org"
}, },
{
"name": "path",
"type": "path",
"ask": {
"en": "Choose a path for ynhexample (only / is accepted for now)",
"fr": "Choisissez un chemin pour diaspora (pour l'instant, uniquement / est accepté)"
},
"example": "/",
"default": "/"
},
{ {
"name": "admin", "name": "admin",
"type": "user", "type": "user",

13
scripts/install
View file

@ -28,7 +28,6 @@ ynh_abort_if_errors
#================================================= #=================================================
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH
admin=$YNH_APP_ARG_ADMIN admin=$YNH_APP_ARG_ADMIN
admin_password=$YNH_APP_ARG_ADMIN_PASSWORD admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
admin_email=$(ynh_user_get_info --username=$admin --key=mail) admin_email=$(ynh_user_get_info --username=$admin --key=mail)
@ -49,25 +48,22 @@ app=$YNH_APP_INSTANCE_NAME
#================================================= #=================================================
# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
#================================================= #=================================================
ynh_script_progression --message="Validating installation parameters..." --time --weight=1 ynh_script_progression --message="Validating installation parameters..." --weight=1
# Normalize the url path syntax
path_url=$(ynh_normalize_url_path $path_url)
# Check web path availability # Check web path availability
ynh_webpath_available --domain=$domain --path_url=$path_url ynh_webpath_available --domain=$domain --path_url=/
# check path availability # check path availability
final_path=/var/www/$app final_path=/var/www/$app
test ! -e "$final_path" || ynh_die "This path already contains a folder" test ! -e "$final_path" || ynh_die "This path already contains a folder"
# Register (book) web path # Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url ynh_webpath_register --app=$app --domain=$domain --path_url=/
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
#================================================= #=================================================
ynh_script_progression --message="Saving app settings..." --time --weight=1 ynh_script_progression --message="Saving app settings..." --time --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=path --value=/
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
#================================================= #=================================================
@ -125,7 +121,6 @@ popd
#================================================= #=================================================
export app export app
export domain export domain
export path_url
export db_pass export db_pass
export final_path export final_path
export admin export admin