Sfoglia il codice sorgente

CI not happy, yet

...and better not show the output from urlwatch, because it could contain
passwords.
Chris Vogel 1 anno fa
parent
commit
0f148b3fef
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 3 3
      scripts/_common.sh

+ 3 - 3
scripts/_common.sh

@@ -772,10 +772,10 @@ flohmarkt_ynh_urlwatch_cron() {
     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 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
-    local urlwatch_error
+    # but if sending email fails (like on CI) just warn. We do not want
+    # to show the output that might contain passwords
     if ! [[ -s /var/www/${app}/urlwatch/cache.file ]] &&
     if ! [[ -s /var/www/${app}/urlwatch/cache.file ]] &&
-        ! ynh_exec_warn sudo -u ${app} urlwatch \
+        ! ynh_exec_fully_quiet 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