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

[fix] Create 'duniter' user with --home-dir as \$datadir

Browse source 
as well with shell in order to be able to run duniter with systemd

So, the configuration get saved in (/home/yunohost.app/duniter) $datadir
with which the service will run with

The consequence of this was at least a broken BMA access due to the
absense of configuration

Run Duniter with 'duniter' user to apply the configuration
to get the config file with correct permissions, using
"ynh_exec_as duniter", an equivalent of su - duniter -c "$cmd"
This commit is contained in:
Moul 2022-05-02 19:23:05 +02:00 committed by M5oul
parent ac485a5388
commit ac91efc755
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/install
View file

@ -62,7 +62,8 @@ ynh_app_setting_set --app=$app --key=port --value=$port
ynh_script_progression --message="Configuring system user…" ynh_script_progression --message="Configuring system user…"
# Create a system user # Create a system user
ynh_system_user_create --username=$app datadir=/home/yunohost.app/$app
ynh_system_user_create --username=$app --home_dir=$datadir --use_shell
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -89,7 +90,6 @@ ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.*-linux-*.deb
#================================================= #=================================================
ynh_script_progression --message="Creating a data directory…" ynh_script_progression --message="Creating a data directory…"
datadir=/home/yunohost.app/$app
ynh_app_setting_set --app=$app --key=datadir --value=$datadir ynh_app_setting_set --app=$app --key=datadir --value=$datadir
mkdir -p $datadir mkdir -p $datadir
@ -103,8 +103,8 @@ chown -R $app:www-data "$datadir"
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file…" ynh_script_progression --message="Adding a configuration file…"
duniter config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp ynh_exec_as duniter duniter config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp
duniter config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp ynh_exec_as duniter duniter config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD

6
scripts/restore
View file

@ -48,7 +48,7 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
ynh_script_progression --message="Recreating the dedicated system user…" ynh_script_progression --message="Recreating the dedicated system user…"
# Create the dedicated user (if not existing) # Create the dedicated user (if not existing)
ynh_system_user_create --username=$app ynh_system_user_create --username=$app --home_dir=$datadir --use_shell
#================================================= #=================================================
# RESTORE THE DATA DIRECTORY # RESTORE THE DATA DIRECTORY
@ -80,8 +80,8 @@ ynh_exec_warn_less dpkg -i $tempdir/duniter-server-v1.8.*-linux-*.deb
#================================================= #=================================================
ynh_script_progression --message="Adding a configuration file…" ynh_script_progression --message="Adding a configuration file…"
duniter config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp ynh_exec_as duniter duniter --home $datadir config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp
duniter config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp ynh_exec_as duniter duniter --home $datadir config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp
#================================================= #=================================================
# RESTORE SYSTEMD # RESTORE SYSTEMD

7
scripts/upgrade
View file

@ -72,7 +72,8 @@ fi
ynh_script_progression --message="Making sure dedicated system user exists…" ynh_script_progression --message="Making sure dedicated system user exists…"
# Create a dedicated user (if not existing) # Create a dedicated user (if not existing)
ynh_system_user_create --username=$app datadir=/home/yunohost.app/$app
ynh_system_user_create --username=$app --home_dir=$datadir --use_shell
#================================================= #=================================================
# NGINX CONFIGURATION # NGINX CONFIGURATION
@ -112,8 +113,8 @@ fi
#================================================= #=================================================
ynh_script_progression --message="Updating a configuration file…" ynh_script_progression --message="Updating a configuration file…"
duniter config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp ynh_exec_as duniter duniter config --bma --ipv4 127.0.0.1 --port $port --remoteh $domain --remotep 443 --noupnp
duniter config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp ynh_exec_as duniter duniter config --ws2p-host 127.0.0.1 --ws2p-port 20901 --ws2p-remote-host $domain --ws2p-remote-port 443 --ws2p-remote-path "/ws2p" --ws2p-noupnp
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD