diff --git a/host_vars/o26.oopen.de.yml b/host_vars/o26.oopen.de.yml index 48728b7..a1eced2 100644 --- a/host_vars/o26.oopen.de.yml +++ b/host_vars/o26.oopen.de.yml @@ -359,10 +359,10 @@ cron_user_special_time_entries: cron_user_entries: - - name: "Renote Borg Backup" + - name: "Remote Borg Backup" minute: '04' hour: '00' - job: /root/crontab/backup-rborg/remote-borg-backup.sh + job: /root/crontab/backup-rborg/rborg.sh - name: "Check if SSH service is running. Restart service if needed." minute: '*/5' @@ -384,27 +384,27 @@ cron_user_entries: hour: '*' job: /root/bin/monitoring/check_ntpsec_service.sh > /dev/null 2>&1 - - name: "Backup internet hosts and then print out hdd-usage for all backuped hosts" - minute: '16' - hour: '00' - weekday: '1-6' - job: /root/crontab/backup-rcopy/rcopy.sh -B ; /root/crontab/backup-rcopy/rcopy.sh -N - - - name: "On sunday morning also determin diskspace usage" - minute: '16' - hour: '00' - weekday: 7 - job: /root/crontab/backup-rcopy/rcopy.sh -B ; /root/crontab/backup-rcopy/rcopy.sh -N ; /root/bin/admin-stuff/disk-space_usage.sh -q -o /root/disk-space_usage /backup - - - name: "Generate/Renew Let's Encrypt Certificates if needed (using dehydrated script)" - minute: '23' - hour: '05' - job: /var/lib/dehydrated/cron/dehydrated_cron.sh - - - name: "Check whether all certificates are included in the VHOST configurations" - minute: '33' - hour: '05' - job: /var/lib/dehydrated/tools/update_ssl_directives.sh +# - name: "Backup internet hosts and then print out hdd-usage for all backuped hosts" +# minute: '16' +# hour: '00' +# weekday: '1-6' +# job: /root/crontab/backup-rcopy/rcopy.sh -B ; /root/crontab/backup-rcopy/rcopy.sh -N +# +# - name: "On sunday morning also determin diskspace usage" +# minute: '16' +# hour: '00' +# weekday: 7 +# job: /root/crontab/backup-rcopy/rcopy.sh -B ; /root/crontab/backup-rcopy/rcopy.sh -N ; /root/bin/admin-stuff/disk-space_usage.sh -q -o /root/disk-space_usage /backup +# +# - name: "Generate/Renew Let's Encrypt Certificates if needed (using dehydrated script)" +# minute: '23' +# hour: '05' +# job: /var/lib/dehydrated/cron/dehydrated_cron.sh +# +# - name: "Check whether all certificates are included in the VHOST configurations" +# minute: '33' +# hour: '05' +# job: /var/lib/dehydrated/tools/update_ssl_directives.sh - name: "Check hard disc usage." minute: '43' diff --git a/hosts b/hosts index 376b512..ba807a5 100644 --- a/hosts +++ b/hosts @@ -48,7 +48,6 @@ gw-d11.oopen.de gw-flr.oopen.de gw-irights.oopen.de gw-km.oopen.de -172.16.122.2 gw-mbr.oopen.de gw-opp.oopen.de gw-spr.oopen.de @@ -68,9 +67,6 @@ gw-replacement2.local.netz gw-replacement3.local.netz gw-replacement4.local.netz -kvm-ipa.local.netz -file-ipa.local.netz - k1371.dyndns.org at-10-neu.ak.netz @@ -190,7 +186,6 @@ o31.oopen.de mail.cadus.org 135.181.22.161 web.cadus.org -wiki.cadus.org # etventure o32.oopen.de @@ -378,7 +373,6 @@ o31.oopen.de mail.cadus.org 135.181.22.161 web.cadus.org -wiki.cadus.org # etventure o32.oopen.de @@ -448,9 +442,6 @@ gw-replacement2.local.netz gw-replacement3.local.netz gw-replacement4.local.netz -kvm-ipa.local.netz -file-ipa.local.netz - # 123Comics gw-123.oopen.de @@ -479,7 +470,6 @@ gw-irights.oopen.de # - Kanzlei Berenice gw-km.oopen.de -172.16.122.2 file-km.anw-km.netz file-kb.anw-kb.netz @@ -617,7 +607,6 @@ o20.oopen.de # o31.oopen.de web.cadus.org -wiki.cadus.org mail.cadus.org 135.181.22.161 @@ -683,7 +672,6 @@ cl-flr.oopen.de # O.OPEN office network # --- -file-ipa.local.netz at-10-neu.ak.netz @@ -903,7 +891,6 @@ lists.mx.warenform.de [postgresql_server] -file-ipa.local.netz # --- # O.OPEN @@ -1018,7 +1005,6 @@ cloud.akweb.de # o31.oopen.de - Cadus e.V. web.cadus.org -wiki.cadus.org mail.cadus.org 135.181.22.161 @@ -1203,7 +1189,6 @@ g.mx.oopen.de ga-st-mail.ga.netz ga-al-relay.ga.netz -file-ipa.local.netz # --- @@ -1430,7 +1415,6 @@ test.mariadb.oopen.de mail.cadus.org 135.181.22.161 web.cadus.org -wiki.cadus.org # o21.oopen.de o21.oopen.de @@ -1527,7 +1511,6 @@ file-kb.anw-kb.netz file-blkr.blkr.netz zapata.opp.netz -file-ipa.local.netz # - GA - Gemeinschaft Altensclirf ga-st-mail.ga.netz @@ -1624,7 +1607,6 @@ o31.oopen.de mail.cadus.org 135.181.22.161 web.cadus.org -wiki.cadus.org # o21.oopen.de o21.oopen.de @@ -1773,7 +1755,6 @@ gw-replacement3.local.netz gw-replacement4.local.netz gw-irights.oopen.de gw-km.oopen.de -172.16.122.2 gw-mbr.oopen.de gw-opp.oopen.de gw-spr.oopen.de