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

Merge pull request #24 from YunoHost-Apps/testing

Testing
This commit is contained in:
Chris Vogel 2024-06-18 13:20:51 +02:00 committed by GitHub
commit 104e75c57e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 21 additions and 28 deletions

View file

@ -8,7 +8,7 @@ User=__APP__
Group=__APP__ Group=__APP__
WorkingDirectory=__FLOHMARKT_APP_DIR__ WorkingDirectory=__FLOHMARKT_APP_DIR__
Environment="VENV_DIR=__FLOHMARKT_VENV_DIR__" Environment="VENV_DIR=__FLOHMARKT_VENV_DIR__"
ExecStart=/bin/bash -c "__FLOHMARKT_VENV_DIR__/bin/uvicorn --factory --host 127.0.0.1 --port __PORT__ flohmarkt.web:start 2>&1 | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%S'" ExecStart=/bin/bash -c "set -o pipefail; __FLOHMARKT_VENV_DIR__/bin/uvicorn --factory --host 127.0.0.1 --port __PORT__ flohmarkt.web:start 2>&1 | /usr/bin/ts '%%Y-%%m-%%d %%H:%%M:%%S'"
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s
# nicer logfile naming https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/38 # nicer logfile naming https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/38

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"

View file

@ -13,6 +13,8 @@ flohmarkt will send email and you'll be asked for an address used as the sender
This [issue](https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/50) contains information about the problem. This [issue](https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/50) contains information about the problem.
There's a [pull request to yunohost](https://github.com/YunoHost/yunohost/pull/1843) open that should solve the problem.
## multiple flohmarkt on the same subdomain will not work ## multiple flohmarkt on the same subdomain will not work
flohmarkt **needs its own subdomain** to be installed on. Some of the discussion about this can be found here: flohmarkt **needs its own subdomain** to be installed on. Some of the discussion about this can be found here:
@ -28,12 +30,6 @@ https://codeberg.org/ChriChri/flohmarkt_ynh/issues/5 .
## removing ## removing
Removing a flohmarkt instance will **delete all of its data** for the time being. If you remove a flohmarkt **we strongly suggest to make a backup** beforehand. This [issue](https://codeberg.org/flohmarkt/flohmarkt_ynh/issues/29) describes how we'll handle `remove` with and without `--purge` in the future.
**Warning:** This might break any existing installation of couchdb (there's an couchdb app to install just couchdb and expose its port via nginx reverse-proxy and possibly other software installing a couchdb). This could happen if you installed the couchdb app after you installed flohmarkt.
https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/remove#L44
When installing flohmarkt on a a domain and letting it talk to other ActivityPub instances it will propagate a key associated to your domain. If you remove your flohmarkt from that domain and loose that key other instances might not want to talk to you anymore after you installed flohmarkt again on the same domain generating a new key. When installing flohmarkt on a a domain and letting it talk to other ActivityPub instances it will propagate a key associated to your domain. If you remove your flohmarkt from that domain and loose that key other instances might not want to talk to you anymore after you installed flohmarkt again on the same domain generating a new key.
## list of instances ## list of instances

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" \
@ -769,11 +771,17 @@ flohmarkt_ynh_urlwatch_cron() {
--destination="/etc/cron.hourly/${flohmarkt_filename}" --destination="/etc/cron.hourly/${flohmarkt_filename}"
chown root:root "/etc/cron.hourly/${flohmarkt_filename}" chown root:root "/etc/cron.hourly/${flohmarkt_filename}"
chmod 755 "/etc/cron.hourly/${flohmarkt_filename}" chmod 755 "/etc/cron.hourly/${flohmarkt_filename}"
# run it once to initialize # run urlwatch once to initialize if cache file does not exist,
sudo -u ${app} urlwatch \ # but if sending email fails (like on CI) just warn. We do not want
--config /var/www/${app}/urlwatch/config.yaml \ # to show the output that might contain passwords
--urls=/var/www/${app}/urlwatch/urls.yaml \ if ! [[ -s /var/www/${app}/urlwatch/cache.file ]] &&
--cache /var/www/${app}/urlwatch/cache.file ! ynh_exec_fully_quiet sudo -u ${app} urlwatch \
--config=/var/www/${app}/urlwatch/config.yaml \
--urls=/var/www/${app}/urlwatch/urls.yaml \
--cache=/var/www/${app}/urlwatch/cache.file
then
ynh_print_warn --message="initial call to urlwatch failed"
fi
} }
flohmarkt_initialized() { flohmarkt_initialized() {

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