--- Systemd::Timer[update-tails-mirror].orig
+++ Systemd::Timer[update-tails-mirror]
- accuracy => 15sec
- fixed_random_delay => False
- timer_intervals => [{'start': 'OnUnitInactiveSec', 'interval': '1h'}, {'interval': '1s', 'start': 'OnActiveSec'}]
- unit_name => update-tails-mirror.service
- splay => 0
- ensure => absent
Exec[systemd daemon-reload for update-tails-mirror.timer (update-tails-mirror.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for update-tails-mirror.timer (update-tails-mirror.timer)].orig
+++ Exec[systemd daemon-reload for update-tails-mirror.timer (update-tails-mirror.timer)]
- command => /bin/systemctl daemon-reload
- refreshonly => True
- Systemd::Service[update-tails-mirror]
- Parameters differences:
--- Systemd::Service[update-tails-mirror].orig
+++ Systemd::Service[update-tails-mirror]
- monitoring_contact_group => admins
- monitoring_enabled => False
- require => Systemd::Unit[update-tails-mirror.service]
- restart => False
- migration_task => T407130
- unit_type => timer
- monitoring_critical => False
- service_params => {}
- override => False
- ensure => absent
- Httpd::Site[mirrors]
- Systemd::Syslog[update-tails-mirror]
- Parameters differences:
--- Systemd::Syslog[update-tails-mirror].orig
+++ Systemd::Syslog[update-tails-mirror]
- log_filename => syslog.log
- readable_by => all
- owner => mirror
- group => root
- programname_comparison => startswith
- base_dir => /var/log
- force_stop => True
- ensure => absent
- Rsync::Server::Module[tails]
- Parameters differences:
--- Rsync::Server::Module[tails].orig
+++ Rsync::Server::Module[tails]
- list => yes
- lock_file => /var/run/rsyncd.lock
- chroot => True
- read_only => yes
- max_connections => 0
- uid => nobody
- write_only => no
- path => /srv/mirror/tails
- auto_firewall => False
- gid => nogroup
- qos_low => False
- ensure => absent
- File[/lib/systemd/system/update-tails-mirror.timer]
- Parameters differences:
--- File[/lib/systemd/system/update-tails-mirror.timer].orig
+++ File[/lib/systemd/system/update-tails-mirror.timer]
- mode => 0444
- owner => root
- group => root
- ensure => absent
- notify => Exec[systemd daemon-reload for update-tails-mirror.timer (update-tails-mirror.timer)]
- Content differences:
--- /lib/systemd/system/update-tails-mirror.timer.orig
+++ /lib/systemd/system/update-tails-mirror.timer
@@ -1,13 +0,0 @@
-[Unit]
-Description=Periodic execution of update-tails-mirror.service
-
-[Timer]
-Unit=update-tails-mirror.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnUnitInactiveSec=1h
-OnActiveSec=1s
-RandomizedDelaySec=0
-
-[Install]
-WantedBy=multi-user.target
- File[/lib/systemd/system/update-tails-mirror.service]
- Parameters differences:
--- File[/lib/systemd/system/update-tails-mirror.service].orig
+++ File[/lib/systemd/system/update-tails-mirror.service]
- mode => 0444
- owner => root
- group => root
- ensure => absent
- notify => Exec[systemd daemon-reload for update-tails-mirror.service (update-tails-mirror.service)]
- Content differences:
--- /lib/systemd/system/update-tails-mirror.service.orig
+++ /lib/systemd/system/update-tails-mirror.service
@@ -1,8 +0,0 @@
-[Unit]
-Description=update the tails mirror with rsync
-Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
-
-[Service]
-Type=oneshot
-User=mirror
-ExecStart=/usr/bin/rsync -rt --delete /srv/mirrors/tails rsync.tails.net::amnesia-archive/tails/
- Systemd::Unit[update-tails-mirror.service]
- Parameters differences:
--- Systemd::Unit[update-tails-mirror.service].orig
+++ Systemd::Unit[update-tails-mirror.service]
- unit => update-tails-mirror.service
- restart => False
- override_filename => puppet-override.conf
- override => False
- require => ['Class[Systemd]']
- ensure => absent
- File[/etc/logrotate.d/update-tails-mirror]
- Parameters differences:
--- File[/etc/logrotate.d/update-tails-mirror].orig
+++ File[/etc/logrotate.d/update-tails-mirror]
- mode => 0444
- group => root
- ensure => absent
- owner => root
- Content differences:
--- /etc/logrotate.d/update-tails-mirror.orig
+++ /etc/logrotate.d/update-tails-mirror
@@ -1,12 +0,0 @@
-# logrotate(8) config for update-tails-mirror
-
-/var/log/update-tails-mirror/*.log {
- daily
- copytruncate
- missingok
- compress
- delaycompress
- notifempty
- rotate 15
- size 256M
-}
- Systemd::Timer::Job[update-tails-mirror]
- Parameters differences:
--- Systemd::Timer::Job[update-tails-mirror].orig
+++ Systemd::Timer::Job[update-tails-mirror]
- ignore_errors => False
- logfile_perms => all
- private_tmp => False
- syslog_force_stop => True
- user => mirror
- monitoring_contact_groups => admins
- fixed_random_delay => False
- send_mail => False
- interval => {'start': 'OnUnitInactiveSec', 'interval': '1h'}
- ensure => absent
- environment => {}
- logging_enabled => True
- send_mail_to => root@mirror1001.wikimedia.org
- syslog_match_startswith => True
- monitoring_enabled => False
- description => update the tails mirror with rsync
- send_mail_only_on_error => True
- command => /usr/bin/rsync -rt --delete /srv/mirrors/tails rsync.tails.net::amnesia-archive/tails/
- logfile_name => syslog.log
- success_exit_status => []
- monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
- logfile_group => root
- logfile_basedir => /var/log
- File[/etc/apache2/sites-available/50-mirrors.conf]
- Content differences:
--- /etc/apache2/sites-available/50-mirrors.conf.orig
+++ /etc/apache2/sites-available/50-mirrors.conf
@@ -9,11 +9,6 @@
Options +Indexes +SymlinksIfOwnerMatch
IndexOptions NameWidth=* +SuppressDescription
Require all granted
- </Directory>
-
- # Per Tails' request
- <Directory /srv/mirrors/tails>
- FileETag None
</Directory>
LogLevel warn
- File[/var/log/update-tails-mirror]
- Parameters differences:
--- File[/var/log/update-tails-mirror].orig
+++ File[/var/log/update-tails-mirror]
- mode => 0755
- force => True
- owner => mirror
- backup => False
- group => root
- ensure => absent
- File[/etc/rsyslog.d/40-update-tails-mirror.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-update-tails-mirror.conf].orig
+++ File[/etc/rsyslog.d/40-update-tails-mirror.conf]
- mode => 0444
- owner => root
- group => root
- ensure => absent
- notify => Service[rsyslog]
- Content differences:
--- /etc/rsyslog.d/40-update-tails-mirror.conf.orig
+++ /etc/rsyslog.d/40-update-tails-mirror.conf
@@ -1,10 +0,0 @@
-# rsyslog.conf(5) configuration file for services.
-# This file is managed by Puppet.
-if $programname startswith "update-tails-mirror" then {
- action(
- type="omfile" file="/var/log/update-tails-mirror/syslog.log"
- fileOwner="mirror" fileGroup="root"
- fileCreateMode="0644"
- )
- & stop
-}
Relevant files