mirror of
https://github.com/YunoHost-Apps/hydrogen_ynh.git
synced 2024-09-03 19:26:17 +02:00
Merge pull request #32 from YunoHost-Apps/testing
Automated testing -> master
This commit is contained in:
commit
1d7ffde523
3 changed files with 12 additions and 11 deletions
|
@ -7,7 +7,7 @@ description.fr = "Client web pour Matrix"
|
|||
|
||||
version = "0.4.1~ynh1"
|
||||
|
||||
maintainers = ["eric_G"]
|
||||
maintainers = []
|
||||
|
||||
[upstream]
|
||||
license = "Apache-2.0"
|
||||
|
@ -19,8 +19,11 @@ code = "https://github.com/vector-im/hydrogen-web"
|
|||
yunohost = ">= 11.2"
|
||||
architectures = "all"
|
||||
multi_instance = true
|
||||
|
||||
ldap = false
|
||||
|
||||
sso = false
|
||||
|
||||
disk = "50M"
|
||||
ram.build = "50M"
|
||||
ram.runtime = "50M"
|
||||
|
|
|
@ -40,7 +40,7 @@ ynh_add_nginx_config
|
|||
#=================================================
|
||||
ynh_script_progression --message="Adding a configuration file..." --weight=1
|
||||
|
||||
ynh_add_config --template="../conf/config.sample.json" --destination="$install_dir/config.json"
|
||||
ynh_add_config --template="config.sample.json" --destination="$install_dir/config.json"
|
||||
|
||||
chmod 660 "$install_dir/config.json"
|
||||
chown $app:www-data "$install_dir/config.json"
|
||||
|
|
|
@ -10,15 +10,6 @@
|
|||
source ../settings/scripts/_common.sh
|
||||
source /usr/share/yunohost/helpers
|
||||
|
||||
#=================================================
|
||||
# STANDARD RESTORATION STEPS
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE APP MAIN DIR
|
||||
#=================================================
|
||||
|
@ -29,6 +20,13 @@ ynh_restore_file --origin_path="$install_dir"
|
|||
chmod -R o-rwx "$install_dir"
|
||||
chown -R $app:www-data "$install_dir"
|
||||
|
||||
#=================================================
|
||||
# RESTORE THE NGINX CONFIGURATION
|
||||
#=================================================
|
||||
ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
|
||||
|
||||
ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
|
||||
|
||||
#=================================================
|
||||
# GENERIC FINALIZATION
|
||||
#=================================================
|
||||
|
|
Loading…
Reference in a new issue