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

Fix

Browse source
This commit is contained in:
Éric Gaspar 2023-02-18 16:35:04 +01:00
parent 49c7dc180f
commit 16bb2e8243
7 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/nginx.conf
View file

@ -7,8 +7,6 @@ location __PATH__/ {
more_set_headers "Content-Security-Policy: frame-ancestors 'self'"; more_set_headers "Content-Security-Policy: frame-ancestors 'self'";
more_set_headers "Content-Security-Policy: frame-ancestors 'self'";
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }

4
manifest.toml
View file

@ -18,11 +18,11 @@ code = "https://github.com/vector-im/element-web/"
cpe = "cpe:2.3:a:matrix:element" cpe = "cpe:2.3:a:matrix:element"
[integration] [integration]
yunohost = ">= 11.1.6" yunohost = ">= 11.1.7"
architectures = "all" architectures = "all"
multi_instance = true multi_instance = true
ldap = false ldap = false
sso = true sso = false
disk = "50M" disk = "50M"
ram.build = "50M" ram.build = "50M"
ram.runtime = "50M" ram.runtime = "50M"

7
scripts/install
View file

@ -13,13 +13,11 @@ source /usr/share/yunohost/helpers
# RETRIEVE ARGUMENTS FROM THE MANIFEST # RETRIEVE ARGUMENTS FROM THE MANIFEST
#================================================= #=================================================
# Retrieve arguments
login_for_welcome=true login_for_welcome=true
#================================================= #=================================================
# STORE SETTINGS FROM MANIFEST # STORE SETTINGS FROM MANIFEST
#================================================= #=================================================
ynh_script_progression --message="Storing installation settings..." --weight=1
ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome ynh_app_setting_set --app=$app --key=login_for_welcome --value=$login_for_welcome
@ -32,13 +30,12 @@ ynh_script_progression --message="Setting up source files..." --weight=4
ynh_setup_source --dest_dir="$install_dir" ynh_setup_source --dest_dir="$install_dir"
# Set permissions to app files # Set permissions to app files
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R $app:www-data "$install_dir"
#================================================= #=================================================
# NGINX CONFIGURATION # SYSTEM CONFIGURATION
#================================================= #=================================================
ynh_script_progression --message="Configuring NGINX web server..." --weight=1 ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_nginx_config ynh_add_nginx_config

4
scripts/remove
View file

@ -10,9 +10,9 @@ source _common.sh
source /usr/share/yunohost/helpers source /usr/share/yunohost/helpers
#================================================= #=================================================
# REMOVE NGINX CONFIGURATION # REMOVE SYSTEM CONFIGURATIONS
#================================================= #=================================================
ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
# Remove the dedicated NGINX config # Remove the dedicated NGINX config
ynh_remove_nginx_config ynh_remove_nginx_config

7
scripts/restore
View file

@ -27,17 +27,14 @@ ynh_script_progression --message="Restoring the app main directory..." --weight=
ynh_restore_file --origin_path="$install_dir" ynh_restore_file --origin_path="$install_dir"
# Set permissions to app files # Set permissions to app files
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R $app:www-data "$install_dir"
chmod 400 "$install_dir/config.json" chmod 400 "$install_dir/config.json"
chown $app:$app "$install_dir/config.json" chown $app:$app "$install_dir/config.json"
#================================================= #=================================================
# GENERIC FINALIZATION # RESTORE SYSTEM CONFIGURATIONS
#================================================= #=================================================
# RELOAD NGINX AND PHP-FPM ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
#=================================================
ynh_script_progression --message="Reloading NGINX web server..." --weight=1
ynh_systemd_action --service_name=nginx --action=reload ynh_systemd_action --service_name=nginx --action=reload

5
scripts/upgrade
View file

@ -44,7 +44,6 @@ then
fi fi
# Set permissions to app files # Set permissions to app files
chmod -R o-rwx "$install_dir"
chown -R $app:www-data "$install_dir" chown -R $app:www-data "$install_dir"
#================================================= #=================================================
@ -58,9 +57,9 @@ chown -R $app:www-data "$install_dir"
#chown $app:$app "$install_dir/config.json" #chown $app:$app "$install_dir/config.json"
#================================================= #=================================================
# NGINX CONFIGURATION # REAPPLY SYSTEM CONFIGURATIONS
#================================================= #=================================================
ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_nginx_config ynh_add_nginx_config

6
tests.toml
View file

@ -2,6 +2,12 @@ test_format = 1.0
[default] [default]
# -------------------------------
# Default args to use for install
# -------------------------------
args.default_home_server = "matrix.org"
# ------------------------------- # -------------------------------
# Commits to test upgrade from # Commits to test upgrade from
# ------------------------------- # -------------------------------