Ver Fonte

documentation, cron filename

Chris Vogel há 1 ano atrás
pai
commit
bd95c07f4d
2 ficheiros alterados com 2 adições e 10 exclusões
  1. 0 8
      doc/PRE_INSTALL.md
  2. 2 2
      scripts/_common.sh

+ 0 - 8
doc/PRE_INSTALL.md

@@ -7,14 +7,6 @@ flohmarkt expects to install CouchDB from the Apache repository for its use. Ins
 https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/install#L9
 https://codeberg.org/flohmarkt/flohmarkt_ynh/src/commit/7721103bac61787f31a4b2f2ae695c65d4f26fc9/scripts/install#L9
 https://codeberg.org/ChriChri/flohmarkt_ynh/issues/9
 https://codeberg.org/ChriChri/flohmarkt_ynh/issues/9
 
 
-## choosing a sender email address
-
-flohmarkt will send email and you'll be asked for an address used as the sender in these emails. yunohost will try to configure your chosen address as an allowed sender, but for the time being **this will only work if the sender address is not in use otherwise** - e.g. as an alias.
-
-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:

+ 2 - 2
scripts/_common.sh

@@ -768,8 +768,8 @@ flohmarkt_ynh_urlwatch_cron() {
     ynh_add_config --template="../conf/urlwatch_urls.yaml" \
     ynh_add_config --template="../conf/urlwatch_urls.yaml" \
         --destination="${flohmarkt_install}/urlwatch/urls.yaml"
         --destination="${flohmarkt_install}/urlwatch/urls.yaml"
     ynh_add_config --template="../conf/urlwatch.cron" \
     ynh_add_config --template="../conf/urlwatch.cron" \
-        --destination="/etc/cron.hourly/${flohmarkt_filename}"
-    chown root:root "/etc/cron.hourly/${flohmarkt_filename}"
+        --destination="/etc/cron.hourly/${app}"
+    chown root:root "/etc/cron.hourly/${app}"
     chmod 755 "/etc/cron.hourly/${flohmarkt_filename}"
     chmod 755 "/etc/cron.hourly/${flohmarkt_filename}"
     # run urlwatch once to initialize if cache file does not exist, 
     # run urlwatch once to initialize if cache file does not exist, 
     # but if sending email fails (like on CI) just warn. We do not want
     # but if sending email fails (like on CI) just warn. We do not want