--- Service[wmf_auto_restart_krb5-kpropd.timer].orig
+++ Service[wmf_auto_restart_krb5-kpropd.timer]
+ before => ['Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)]']
@@
- enable => True
+ enable => False
@@
- ensure => running
+ ensure => stopped
Service[wmf_auto_restart_rsync.timer]
- Parameters differences:
--- Service[wmf_auto_restart_rsync.timer].orig
+++ Service[wmf_auto_restart_rsync.timer]
- before => ['Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)]']
@@
- enable => False
+ enable => True
@@
- ensure => stopped
+ ensure => running
- File[/etc/logrotate.d/wmf_auto_restart_rsync]
- Parameters differences:
--- File[/etc/logrotate.d/wmf_auto_restart_rsync].orig
+++ File[/etc/logrotate.d/wmf_auto_restart_rsync]
@@
- ensure => absent
+ ensure => present
- File[/usr/local/sbin/replicate_krb_database]
- Parameters differences:
--- File[/usr/local/sbin/replicate_krb_database].orig
+++ File[/usr/local/sbin/replicate_krb_database]
@@
- ensure => absent
+ ensure => present
- Content differences:
--- /usr/local/sbin/replicate_krb_database.orig
+++ /usr/local/sbin/replicate_krb_database
@@ -8,5 +8,4 @@
KRB_DATABASE_FILE=/srv/backup/kdc_database_krepl_$(date +%Y%m%d%H%M%S)
/usr/sbin/kdb5_util dump $KRB_DATABASE_FILE
-/usr/sbin/kprop -d -f $KRB_DATABASE_FILE krb2002.codfw.wmnet
rm -f $KRB_DATABASE_FILE
- File[/etc/update-motd.d/01-inactive-warning]
- Parameters differences:
--- File[/etc/update-motd.d/01-inactive-warning].orig
+++ File[/etc/update-motd.d/01-inactive-warning]
@@
- ensure => present
+ ensure => absent
- Content differences:
--- /etc/update-motd.d/01-inactive-warning.orig
+++ /etc/update-motd.d/01-inactive-warning
@@ -18,6 +18,6 @@
command since credentials are kept in sync via kprod replication.
-The current active kadmin host is krb1002.eqiad.wmnet
+The current active kadmin host is krb2002.codfw.wmnet
MOTD
- Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_rsync.timer (wmf_auto_restart_rsync.timer)]
+ before => ['Service[wmf_auto_restart_rsync.timer]']
- Exec[systemd daemon-reload for replicate-krb-database.timer (replicate-krb-database.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for replicate-krb-database.timer (replicate-krb-database.timer)].orig
+++ Exec[systemd daemon-reload for replicate-krb-database.timer (replicate-krb-database.timer)]
+ before => ['Service[replicate-krb-database.timer]']
- File[/lib/systemd/system/wmf_auto_restart_rsync.service]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_rsync.service].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rsync.service]
@@
- ensure => absent
+ ensure => present
- File[/etc/krb5.conf]
- Content differences:
--- /etc/krb5.conf.orig
+++ /etc/krb5.conf
@@ -12,9 +12,8 @@
[realms]
WIKIMEDIA = {
- kdc = krb1002.eqiad.wmnet
kdc = krb2002.codfw.wmnet
- admin_server = krb1002.eqiad.wmnet
+ admin_server = krb2002.codfw.wmnet
}
[domain_realm]
- File[/etc/nagios/nrpe.d/check_check_replicate-krb-database_status.cfg]
- Parameters differences:
--- File[/etc/nagios/nrpe.d/check_check_replicate-krb-database_status.cfg].orig
+++ File[/etc/nagios/nrpe.d/check_check_replicate-krb-database_status.cfg]
@@
- ensure => absent
+ ensure => present
- File_line[auto_restart_file_presence_krb5-kpropd]
- Parameters differences:
--- File_line[auto_restart_file_presence_krb5-kpropd].orig
+++ File_line[auto_restart_file_presence_krb5-kpropd]
@@
- ensure => present
+ ensure => absent
- File[/lib/systemd/system/replicate-krb-database.timer]
- Parameters differences:
--- File[/lib/systemd/system/replicate-krb-database.timer].orig
+++ File[/lib/systemd/system/replicate-krb-database.timer]
@@
- ensure => absent
+ ensure => present
- File[/lib/systemd/system/wmf_auto_restart_rsync.timer]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_rsync.timer].orig
+++ File[/lib/systemd/system/wmf_auto_restart_rsync.timer]
@@
- ensure => absent
+ ensure => present
- File[/etc/krb5kdc/kpropd.acl]
- Parameters differences:
--- File[/etc/krb5kdc/kpropd.acl].orig
+++ File[/etc/krb5kdc/kpropd.acl]
- mode => 0444
- before => Package[krb5-kpropd]
+ ensure => absent
- Content differences:
--- /etc/krb5kdc/kpropd.acl.orig
+++ /etc/krb5kdc/kpropd.acl
@@ -1,2 +0,0 @@
-host/krb1002.eqiad.wmnet@WIKIMEDIA
-host/krb2002.codfw.wmnet@WIKIMEDIA
- Service[replicate-krb-database.timer]
- Parameters differences:
--- Service[replicate-krb-database.timer].orig
+++ Service[replicate-krb-database.timer]
- before => ['Exec[systemd daemon-reload for replicate-krb-database.timer (replicate-krb-database.timer)]']
@@
- enable => False
+ enable => True
@@
- ensure => stopped
+ ensure => running
- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-krb5-kpropd.conf]
@@
- ensure => present
+ ensure => absent
- File[/etc/logrotate.d/wmf_auto_restart_krb5-kpropd]
- Parameters differences:
--- File[/etc/logrotate.d/wmf_auto_restart_krb5-kpropd].orig
+++ File[/etc/logrotate.d/wmf_auto_restart_krb5-kpropd]
@@
- ensure => present
+ ensure => absent
- File[/lib/systemd/system/replicate-krb-database.service]
- Parameters differences:
--- File[/lib/systemd/system/replicate-krb-database.service].orig
+++ File[/lib/systemd/system/replicate-krb-database.service]
@@
- ensure => absent
+ ensure => present
- File[/var/log/wmf_auto_restart_rsync]
- Parameters differences:
--- File[/var/log/wmf_auto_restart_rsync].orig
+++ File[/var/log/wmf_auto_restart_rsync]
@@
- ensure => absent
+ ensure => directory
- File_line[auto_restart_file_presence_rsync]
- Parameters differences:
--- File_line[auto_restart_file_presence_rsync].orig
+++ File_line[auto_restart_file_presence_rsync]
@@
- ensure => absent
+ ensure => present
- Exec[debconf-set-selections set string krb5-config/kerberos_servers]
- Parameters differences:
--- Exec[debconf-set-selections set string krb5-config/kerberos_servers].orig
+++ Exec[debconf-set-selections set string krb5-config/kerberos_servers]
@@
- unless => test "$(echo get krb5-config/kerberos_servers | debconf-communicate)" = "0 krb1002.eqiad.wmnet krb2002.codfw.wmnet"
+ unless => test "$(echo get krb5-config/kerberos_servers | debconf-communicate)" = "0 krb2002.codfw.wmnet"
@@
- command => echo set krb5-config/kerberos_servers string "krb1002.eqiad.wmnet krb2002.codfw.wmnet" | debconf-set-selections
+ command => echo set krb5-config/kerberos_servers string "krb2002.codfw.wmnet" | debconf-set-selections
- Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)].orig
+++ Exec[systemd daemon-reload for wmf_auto_restart_krb5-kpropd.timer (wmf_auto_restart_krb5-kpropd.timer)]
- before => ['Service[wmf_auto_restart_krb5-kpropd.timer]']
- File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf].orig
+++ File[/etc/rsyslog.d/40-wmf-auto-restart-rsync.conf]
@@
- ensure => absent
+ ensure => present
- File[/etc/nftables/input/10_rsyncd_access_srv-keytabs.nft]
- Parameters differences:
--- File[/etc/nftables/input/10_rsyncd_access_srv-keytabs.nft].orig
+++ File[/etc/nftables/input/10_rsyncd_access_srv-keytabs.nft]
@@
- ensure => absent
+ ensure => present
- File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.timer]
- Parameters differences:
--- File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.timer].orig
+++ File[/lib/systemd/system/wmf_auto_restart_krb5-kpropd.timer]
@@
- ensure => present
+ ensure => absent