--- Systemd::Timer[backup-restore].orig
+++ Systemd::Timer[backup-restore]
- timer_intervals => [{'start': 'OnCalendar', 'interval': '*-*-* 02,16:00:00'}]
- splay => 0
- ensure => present
- unit_name => backup-restore.service
- fixed_random_delay => False
- accuracy => 15sec
Logrotate::Conf[gitlab-backup-restore]
- Parameters differences:
--- Logrotate::Conf[gitlab-backup-restore].orig
+++ Logrotate::Conf[gitlab-backup-restore]
+ ensure => present
- Rsyslog::Conf[backup-restore]
- Parameters differences:
--- Rsyslog::Conf[backup-restore].orig
+++ Rsyslog::Conf[backup-restore]
- require => File[/var/log/backup-restore]
- priority => 40
- ensure => present
- mode => 0444
- Systemd::Syslog[backup-restore]
- Parameters differences:
--- Systemd::Syslog[backup-restore].orig
+++ Systemd::Syslog[backup-restore]
- readable_by => all
- log_filename => syslog.log
- base_dir => /var/log
- programname_comparison => startswith
- ensure => present
- group => root
- force_stop => True
- owner => root
- Service[backup-restore.timer]
- Parameters differences:
--- Service[backup-restore.timer].orig
+++ Service[backup-restore.timer]
- enable => True
- provider => systemd
- ensure => running
- Exec[systemd daemon-reload for gitlab-backup-restore.service (gitlab-backup-restore.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for gitlab-backup-restore.service (gitlab-backup-restore.service)].orig
+++ Exec[systemd daemon-reload for gitlab-backup-restore.service (gitlab-backup-restore.service)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Systemd::Unit[gitlab-backup-restore.service]
- Parameters differences:
--- Systemd::Unit[gitlab-backup-restore.service].orig
+++ Systemd::Unit[gitlab-backup-restore.service]
+ override_filename => puppet-override.conf
+ unit => gitlab-backup-restore.service
+ require => ['Class[Systemd]']
+ override => False
+ restart => False
+ ensure => present
- Systemd::Service[backup-restore]
- Parameters differences:
--- Systemd::Service[backup-restore].orig
+++ Systemd::Service[backup-restore]
- unit_type => timer
- monitoring_critical => False
- override => False
- service_params => {}
- monitoring_enabled => False
- restart => False
- ensure => present
- monitoring_contact_group => admins
- require => Systemd::Unit[backup-restore.service]
- migration_task => T407130
- Exec[systemd daemon-reload for backup-restore.service (backup-restore.service)]
- Parameters differences:
--- Exec[systemd daemon-reload for backup-restore.service (backup-restore.service)].orig
+++ Exec[systemd daemon-reload for backup-restore.service (backup-restore.service)]
- command => /bin/systemctl daemon-reload
- refreshonly => True
- Systemd::Service[gitlab-backup-restore]
- Parameters differences:
--- Systemd::Service[gitlab-backup-restore].orig
+++ Systemd::Service[gitlab-backup-restore]
+ unit_type => timer
+ monitoring_critical => False
+ override => False
+ service_params => {}
+ monitoring_enabled => False
+ restart => False
+ ensure => present
+ monitoring_contact_group => admins
+ require => Systemd::Unit[gitlab-backup-restore.service]
+ migration_task => T407130
- Systemd::Unit[gitlab-backup-restore.timer]
- Parameters differences:
--- Systemd::Unit[gitlab-backup-restore.timer].orig
+++ Systemd::Unit[gitlab-backup-restore.timer]
+ override_filename => puppet-override.conf
+ unit => gitlab-backup-restore.timer
+ require => ['Class[Systemd]']
+ override => False
+ restart => False
+ ensure => present
- File[/lib/systemd/system/gitlab-backup-restore.service]
- Parameters differences:
--- File[/lib/systemd/system/gitlab-backup-restore.service].orig
+++ File[/lib/systemd/system/gitlab-backup-restore.service]
+ notify => Exec[systemd daemon-reload for gitlab-backup-restore.service (gitlab-backup-restore.service)]
+ group => root
+ owner => root
+ ensure => present
+ mode => 0444
- Content differences:
--- /lib/systemd/system/gitlab-backup-restore.service.orig
+++ /lib/systemd/system/gitlab-backup-restore.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=GitLab Backup Restore
+Documentation=https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+
+[Service]
+Type=oneshot
+User=root
+ExecStart=/srv/gitlab-backup/gitlab-restore.sh
- File[/var/log/gitlab-backup-restore]
- Parameters differences:
--- File[/var/log/gitlab-backup-restore].orig
+++ File[/var/log/gitlab-backup-restore]
+ force => True
+ mode => 0755
+ group => root
+ backup => False
+ ensure => directory
+ owner => root
- File[/lib/systemd/system/backup-restore.timer]
- Parameters differences:
--- File[/lib/systemd/system/backup-restore.timer].orig
+++ File[/lib/systemd/system/backup-restore.timer]
- notify => Exec[systemd daemon-reload for backup-restore.timer (backup-restore.timer)]
- group => root
- owner => root
- ensure => present
- mode => 0444
- Content differences:
--- /lib/systemd/system/backup-restore.timer.orig
+++ /lib/systemd/system/backup-restore.timer
@@ -1,12 +0,0 @@
-[Unit]
-Description=Periodic execution of backup-restore.service
-
-[Timer]
-Unit=backup-restore.service
-# Accuracy sets the maximum time interval around the execution time we want to allow
-AccuracySec=15sec
-OnCalendar=*-*-* 02,16:00:00
-RandomizedDelaySec=0
-
-[Install]
-WantedBy=multi-user.target
- Service[gitlab-backup-restore.timer]
- Parameters differences:
--- Service[gitlab-backup-restore.timer].orig
+++ Service[gitlab-backup-restore.timer]
+ enable => True
+ provider => systemd
+ ensure => running
- File[/etc/logrotate.d/backup-restore]
- Parameters differences:
--- File[/etc/logrotate.d/backup-restore].orig
+++ File[/etc/logrotate.d/backup-restore]
- mode => 0444
- group => root
- ensure => present
- owner => root
- Content differences:
--- /etc/logrotate.d/backup-restore.orig
+++ /etc/logrotate.d/backup-restore
@@ -1,12 +0,0 @@
-# logrotate(8) config for backup-restore
-
-/var/log/backup-restore/*.log {
- daily
- copytruncate
- missingok
- compress
- delaycompress
- notifempty
- rotate 15
- size 256M
-}
- File[/etc/rsyslog.d/40-backup-restore.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-backup-restore.conf].orig
+++ File[/etc/rsyslog.d/40-backup-restore.conf]
- notify => Service[rsyslog]
- mode => 0444
- group => root
- ensure => present
- owner => root
- Content differences:
--- /etc/rsyslog.d/40-backup-restore.conf.orig
+++ /etc/rsyslog.d/40-backup-restore.conf
@@ -1,10 +0,0 @@
-# rsyslog.conf(5) configuration file for services.
-# This file is managed by Puppet.
-if $programname startswith "backup-restore" then {
- action(
- type="omfile" file="/var/log/backup-restore/syslog.log"
- fileOwner="root" fileGroup="root"
- fileCreateMode="0644"
- )
- & stop
-}
- Rsyslog::Conf[gitlab-backup-restore]
- Parameters differences:
--- Rsyslog::Conf[gitlab-backup-restore].orig
+++ Rsyslog::Conf[gitlab-backup-restore]
+ require => File[/var/log/gitlab-backup-restore]
+ priority => 40
+ ensure => present
+ mode => 0444
- Systemd::Syslog[gitlab-backup-restore]
- Parameters differences:
--- Systemd::Syslog[gitlab-backup-restore].orig
+++ Systemd::Syslog[gitlab-backup-restore]
+ readable_by => all
+ log_filename => syslog.log
+ base_dir => /var/log
+ programname_comparison => startswith
+ ensure => present
+ group => root
+ force_stop => True
+ owner => root
- File[/etc/logrotate.d/gitlab-backup-restore]
- Parameters differences:
--- File[/etc/logrotate.d/gitlab-backup-restore].orig
+++ File[/etc/logrotate.d/gitlab-backup-restore]
+ mode => 0444
+ group => root
+ ensure => present
+ owner => root
- Content differences:
--- /etc/logrotate.d/gitlab-backup-restore.orig
+++ /etc/logrotate.d/gitlab-backup-restore
@@ -0,0 +1,12 @@
+# logrotate(8) config for gitlab-backup-restore
+
+/var/log/gitlab-backup-restore/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- File[/etc/rsyslog.d/40-gitlab-backup-restore.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-gitlab-backup-restore.conf].orig
+++ File[/etc/rsyslog.d/40-gitlab-backup-restore.conf]
+ notify => Service[rsyslog]
+ mode => 0444
+ group => root
+ ensure => present
+ owner => root
- Content differences:
--- /etc/rsyslog.d/40-gitlab-backup-restore.conf.orig
+++ /etc/rsyslog.d/40-gitlab-backup-restore.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "gitlab-backup-restore" then {
+ action(
+ type="omfile" file="/var/log/gitlab-backup-restore/syslog.log"
+ fileOwner="root" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- Systemd::Timer[gitlab-backup-restore]
- Parameters differences:
--- Systemd::Timer[gitlab-backup-restore].orig
+++ Systemd::Timer[gitlab-backup-restore]
+ timer_intervals => [{'start': 'OnCalendar', 'interval': '*-*-* 02,16:00:00'}]
+ splay => 0
+ ensure => present
+ unit_name => gitlab-backup-restore.service
+ fixed_random_delay => False
+ accuracy => 15sec
- Logrotate::Conf[backup-restore]
- Parameters differences:
--- Logrotate::Conf[backup-restore].orig
+++ Logrotate::Conf[backup-restore]
- ensure => present
- File[/var/log/backup-restore]
- Parameters differences:
--- File[/var/log/backup-restore].orig
+++ File[/var/log/backup-restore]
- force => True
- mode => 0755
- group => root
- backup => False
- ensure => directory
- owner => root
- Exec[systemd daemon-reload for gitlab-backup-restore.timer (gitlab-backup-restore.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for gitlab-backup-restore.timer (gitlab-backup-restore.timer)].orig
+++ Exec[systemd daemon-reload for gitlab-backup-restore.timer (gitlab-backup-restore.timer)]
+ before => ['Service[gitlab-backup-restore.timer]']
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Exec[systemd daemon-reload for backup-restore.timer (backup-restore.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for backup-restore.timer (backup-restore.timer)].orig
+++ Exec[systemd daemon-reload for backup-restore.timer (backup-restore.timer)]
- before => ['Service[backup-restore.timer]']
- command => /bin/systemctl daemon-reload
- refreshonly => True
- Systemd::Unit[backup-restore.timer]
- Parameters differences:
--- Systemd::Unit[backup-restore.timer].orig
+++ Systemd::Unit[backup-restore.timer]
- override_filename => puppet-override.conf
- unit => backup-restore.timer
- require => ['Class[Systemd]']
- override => False
- restart => False
- ensure => present
- Systemd::Timer::Job[backup-restore]
- Parameters differences:
--- Systemd::Timer::Job[backup-restore].orig
+++ Systemd::Timer::Job[backup-restore]
- interval => {'start': 'OnCalendar', 'interval': '*-*-* 02,16:00:00'}
- logfile_perms => all
- syslog_force_stop => True
- logging_enabled => True
- user => root
- ignore_errors => False
- success_exit_status => []
- monitoring_contact_groups => admins
- send_mail => False
- logfile_basedir => /var/log
- send_mail_only_on_error => True
- monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
- description => GitLab Backup Restore
- private_tmp => False
- fixed_random_delay => False
- command => /srv/gitlab-backup/gitlab-restore.sh
- monitoring_enabled => False
- ensure => present
- logfile_group => root
- send_mail_to => root@gitlab2002.wikimedia.org
- environment => {}
- logfile_name => syslog.log
- syslog_match_startswith => True
- Systemd::Timer::Job[gitlab-backup-restore]
- Parameters differences:
--- Systemd::Timer::Job[gitlab-backup-restore].orig
+++ Systemd::Timer::Job[gitlab-backup-restore]
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* 02,16:00:00'}
+ logfile_perms => all
+ syslog_force_stop => True
+ logging_enabled => True
+ user => root
+ ignore_errors => False
+ success_exit_status => []
+ monitoring_contact_groups => admins
+ send_mail => False
+ logfile_basedir => /var/log
+ send_mail_only_on_error => True
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ description => GitLab Backup Restore
+ private_tmp => False
+ fixed_random_delay => False
+ command => /srv/gitlab-backup/gitlab-restore.sh
+ monitoring_enabled => False
+ ensure => present
+ logfile_group => root
+ send_mail_to => root@gitlab2002.wikimedia.org
+ environment => {}
+ logfile_name => syslog.log
+ syslog_match_startswith => True
- Systemd::Unit[backup-restore.service]
- Parameters differences:
--- Systemd::Unit[backup-restore.service].orig
+++ Systemd::Unit[backup-restore.service]
- override_filename => puppet-override.conf
- unit => backup-restore.service
- require => ['Class[Systemd]']
- override => False
- restart => False
- ensure => present