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

cleaning, correct setting of permissions

Browse source
This commit is contained in:
Chris Vogel 2024-06-18 09:53:14 +02:00
parent 2eb060951e
commit 8a3f8ddecb
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config_panel.toml
View file

@ -24,10 +24,3 @@ version = "1.0"
help.en = "open this url to finish your flohmarkt setup" help.en = "open this url to finish your flohmarkt setup"
help.de = "öffne die URL um flohmarkt fertig zu konfigurieren" help.de = "öffne die URL um flohmarkt fertig zu konfigurieren"
#[flohmarkt_setup]
# name = "setup"
# [flohmarkt_setup.flohmarkt_initial_setup_url]
# name = "initial setup url"
# type = "string"
# ask = "open this url to initially setup flohmarkt"
# help = "you can't change this value"

16
scripts/_common.sh
View file

@ -570,9 +570,11 @@ flohmarkt_ynh_create_symlinks() {
# set file permissions and owner for installation # set file permissions and owner for installation
flohmarkt_ynh_set_permission() { flohmarkt_ynh_set_permission() {
# install dir - only root needs to write and $app reads # venv and app - only root needs to write and $app reads
chown root:$app -R "$flohmarkt_install" chown root:$app -R "$flohmarkt_venv_dir"
chmod g-w,o-rwx -R "$flohmarkt_install" chmod g-w,o-rwx -R "$flohmarkt_venv_dir"
chown root:$app -R "$flohmarkt_app_dir"
chmod g-w,o-rwx -R "$flohmarkt_app_dir"
} }
# start flohmarkt service # start flohmarkt service
@ -759,8 +761,8 @@ flohmarkt_ynh_venv_requirements() {
} }
flohmarkt_ynh_urlwatch_cron() { flohmarkt_ynh_urlwatch_cron() {
mkdir -m 770 -p "${flohmarkt_install}/urlwatch" mkdir -m 750 -p "${flohmarkt_install}/urlwatch"
chown root:${app} "${flohmarkt_install}/urlwatch" chown ${app}:root "${flohmarkt_install}/urlwatch"
ynh_add_config --template="../conf/urlwatch_config.yaml" \ ynh_add_config --template="../conf/urlwatch_config.yaml" \
--destination="${flohmarkt_install}/urlwatch/config.yaml" --destination="${flohmarkt_install}/urlwatch/config.yaml"
ynh_add_config --template="../conf/urlwatch_urls.yaml" \ ynh_add_config --template="../conf/urlwatch_urls.yaml" \
@ -771,9 +773,9 @@ flohmarkt_ynh_urlwatch_cron() {
chmod 755 "/etc/cron.hourly/${flohmarkt_filename}" chmod 755 "/etc/cron.hourly/${flohmarkt_filename}"
# run it once to initialize # run it once to initialize
sudo -u ${app} urlwatch \ sudo -u ${app} urlwatch \
--config /var/www/${app}/urlwatch/config.yaml \ --config=/var/www/${app}/urlwatch/config.yaml \
--urls=/var/www/${app}/urlwatch/urls.yaml \ --urls=/var/www/${app}/urlwatch/urls.yaml \
--cache /var/www/${app}/urlwatch/cache.file --cache=/var/www/${app}/urlwatch/cache.file
} }
flohmarkt_initialized() { flohmarkt_initialized() {

4
scripts/upgrade
View file

@ -9,10 +9,6 @@ source /usr/share/yunohost/helpers
# UPGRADE_SAME # UPGRADE_SAME
upgrade_type=$(ynh_check_app_version_changed) upgrade_type=$(ynh_check_app_version_changed)
# show variables - used from installed or from to be upgraded version?
# variables of the new upgrade version are used
# env
ynh_script_progression --message="Stopping flohmarkt and CouchDB..." --weight=5 ynh_script_progression --message="Stopping flohmarkt and CouchDB..." --weight=5
# stop flohmarkt # stop flohmarkt
flohmarkt_ynh_stop_service flohmarkt_ynh_stop_service