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

Merge branch 'testing' into patch-2

Browse source
This commit is contained in:
eric_G 2023-12-14 19:47:40 +01:00 • committed by GitHub
commit 5e13034146
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manifest.toml
View file

@ -20,8 +20,11 @@ fund = "https://liberapay.com/timokoesters/"
yunohost = ">= 11.2"
architectures = ["arm64", "amd64", "armhf"]
multi_instance = false
ldap = "not_relevant"
sso = "not_relevant"
disk = "50M"
ram.build = "50M"
ram.runtime = "50M"

1
scripts/backup
View file

@ -6,7 +6,6 @@
# IMPORT GENERIC HELPERS
#=================================================
# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
source ../settings/scripts/_common.sh
source /usr/share/yunohost/helpers

5
scripts/install
View file

@ -28,12 +28,11 @@ ynh_app_setting_set --app=$app --key=federation --value=$federation
#=================================================
ynh_script_progression --message="Setting up source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir"
chmod -R o-rwx "$install_dir"
chown -R $app:root "$install_dir"
chmod +x -R "$install_dir/conduit"
chmod +x "$install_dir/conduit"
#=================================================
# SYSTEM CONFIGURATION
@ -61,7 +60,7 @@ yunohost service add $app --description="Chat server powered by Matrix" --log="/
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
ynh_add_config --template="../conf/conduit.toml" --destination="$install_dir/conduit.toml"
ynh_add_config --template="conduit.toml" --destination="$install_dir/conduit.toml"
chmod 400 "$install_dir/conduit.toml"
chown $app:root "$install_dir/conduit.toml"

2
scripts/remove
View file

@ -16,8 +16,6 @@ source /usr/share/yunohost/helpers
#=================================================
ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
# This should be a symetric version of what happens in the install script
# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
if ynh_exec_warn_less yunohost service status $app >/dev/null
then

1
scripts/restore
View file

@ -43,7 +43,6 @@ yunohost service add $app --description="Chat server powered by Matrix" --log="/
#=================================================
ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1
# Typically you only have either $app or php-fpm but not both at the same time...
ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
ynh_systemd_action --service_name=nginx --action=reload

13
scripts/upgrade
View file

@ -28,12 +28,11 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then
ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir"
ynh_setup_source --dest_dir="$install_dir" --keep="conduit.toml"
fi
chown -R $app:root "$install_dir"
chmod +x -R "$install_dir/conduit"
chmod +x "$install_dir/conduit"
#=================================================
# REAPPLY SYSTEM CONFIGURATIONS
@ -57,12 +56,12 @@ yunohost service add $app --description="Chat server powered by Matrix" --log="/
#=================================================
# UPDATE A CONFIG FILE
#=================================================
#ynh_script_progression --message="Updating a configuration file..." --weight=1
ynh_script_progression --message="Updating a configuration file..." --weight=1
#ynh_add_config --template="../conf/conduit.toml" --destination="$install_dir/conduit.toml"
ynh_add_config --template="conduit.toml" --destination="$install_dir/conduit.toml"
#chmod 400 "$install_dir/conduit.toml"
#chown $app:$app "$install_dir/conduit.toml"
chmod 400 "$install_dir/conduit.toml"
chown $app:$app "$install_dir/conduit.toml"
#=================================================
# START SYSTEMD SERVICE