diff --git a/contrib/package/arch/copyparty-user.service b/contrib/package/arch/copyparty-user.service index c0356e34..ab29e547 100644 --- a/contrib/package/arch/copyparty-user.service +++ b/contrib/package/arch/copyparty-user.service @@ -11,12 +11,16 @@ Description=copyparty file server [Service] Type=notify SyslogIdentifier=copyparty -Environment=PYTHONUNBUFFERED=x WorkingDirectory=/var/lib/copyparty-jail +Environment=PYTHONUNBUFFERED=x +Environment=PRTY_CONFIG=%h/.config/copyparty/copyparty.conf ExecReload=/bin/kill -s USR1 $MAINPID +# exit if user config doesn't exist +ExecStartPre=/bin/bash -c 'if [[ ! -f "$PRTY_CONFIG" ]] ||; then echo "Config file ${PRTY_CONFIG} not found"; exit 1; fi' + # run copyparty -ExecStart=/usr/bin/python3 /usr/bin/copyparty -c %h/.config/copyparty/copyparty.conf +ExecStart=/usr/bin/python3 /usr/bin/copyparty [Install] WantedBy=default.target diff --git a/contrib/package/arch/prisonparty-user.service b/contrib/package/arch/prisonparty-user.service index 884a5451..fd38d1f4 100644 --- a/contrib/package/arch/prisonparty-user.service +++ b/contrib/package/arch/prisonparty-user.service @@ -13,16 +13,21 @@ Description=copyparty file server [Service] +Type=notify SyslogIdentifier=prisonparty -Environment=PYTHONUNBUFFERED=x WorkingDirectory=/var/lib/copyparty-jail +Environment=PYTHONUNBUFFERED=x +Environment=PRTY_CONFIG=%h/.config/copyparty/copyparty.conf ExecReload=/bin/kill -s USR1 $MAINPID +# exit if user config doesn't exist +ExecStartPre=/bin/bash -c 'if [[ ! -f "$PRTY_CONFIG" ]] ||; then echo "Config file ${PRTY_CONFIG} not found"; exit 1; fi' + # run copyparty ExecStart=/bin/bash /usr/bin/prisonparty /var/lib/copyparty-jail %u %u \ %h/.config/copyparty \ -- \ - /usr/bin/python3 /usr/bin/copyparty -c %h/.config/copyparty/copyparty.conf + /usr/bin/python3 /usr/bin/copyparty [Install] WantedBy=default.target