--- Class[Adduser].orig
+++ Class[Adduser]
@@
- before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[bacula-fd]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[openjdk-17-dbg]', 'Package[python3-virtualenv]', 'Package[virtualenv]', 'Package[python3-pip]', 'Package[apache2]', 'Package[links]', 'Package[rsync]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[openjdk-17-jdk]', 'Package[git-lfs]', 'Package[python3-venv]', 'Package[gerrit/gerrit]', 'Package[gervert/deploy]', 'Package[stunnel4]', 'Package[mtail]', 'Package[prometheus-apache-exporter]']
+ before => ['Package[puppet]', 'Package[facter]', 'Package[augeas-tools]', 'Package[virt-what]', 'Package[puppet-module-puppetlabs-augeas-core]', 'Package[python3-prometheus-client]', 'Package[python3-yaml]', 'Package[ruby-net-ssh]', 'Package[openssl]', 'Package[ssl-cert]', 'Package[ca-certificates]', 'Package[wmf-certificates]', 'Package[ntp]', 'Package[systemd-timesyncd]', 'Package[exim4-config]', 'Package[exim4-daemon-light]', 'Package[logrotate]', 'Package[prometheus-node-exporter]', 'Package[bsdutils]', 'Package[smartmontools]', 'Package[rsyslog]', 'Package[rsyslog-openssl]', 'Package[cadvisor]', 'Package[prometheus-ethtool-exporter]', 'Package[acct]', 'Package[byobu]', 'Package[colordiff]', 'Package[curl]', 'Package[debian-goodies]', 'Package[ethtool]', 'Package[gdb]', 'Package[gdisk]', 'Package[git]', 'Package[htop]', 'Package[httpry]', 'Package[iotop]', 'Package[iperf]', 'Package[jq]', 'Package[libtemplate-perl]', 'Package[lldpd]', 'Package[lshw]', 'Package[molly-guard]', 'Package[moreutils]', 'Package[net-tools]', 'Package[numactl]', 'Package[ncdu]', 'Package[ngrep]', 'Package[pigz]', 'Package[psmisc]', 'Package[pv]', 'Package[python3]', 'Package[screen]', 'Package[strace]', 'Package[sysstat]', 'Package[tcpdump]', 'Package[tmux]', 'Package[tree]', 'Package[vim]', 'Package[vim-addon-manager]', 'Package[vim-scripts]', 'Package[wipe]', 'Package[xfsprogs]', 'Package[zsh]', 'Package[icdiff]', 'Package[linux-perf]', 'Package[bsd-mailx]', 'Package[ack]', 'Package[netcat-openbsd]', 'Package[tshark]', 'Package[fzf]', 'Package[ripgrep]', 'Package[fd-find]', 'Package[kitty-terminfo]', 'Package[mtr-tiny]', 'Package[bat]', 'Package[efibootmgr]', 'Package[bind9-dnsutils]', 'Package[tzdata]', 'Package[python3-wmflib]', 'Package[ruby-sorted-set]', 'Package[btop]', 'Package[dstat]', 'Package[apport]', 'Package[command-not-found]', 'Package[command-not-found-data]', 'Package[ecryptfs-utils]', 'Package[mlocate]', 'Package[os-prober]', 'Package[python3-apport]', 'Package[wpasupplicant]', 'Package[apt-listchanges]', 'Package[isc-dhcp-client]', 'Package[rasdaemon]', 'Package[libicu67]', 'Package[libwsutil12]', 'Package[libwireshark14]', 'Package[libopencsd0]', 'Package[libwiretap11]', 'Package[ruby2.7]', 'Package[python3.9-minimal]', 'Package[python3.9]', 'Package[perl-modules-5.32]', 'Package[libpython3.9]', 'Package[libperl5.32]', 'Package[libpython3.9-minimal]', 'Package[libpython3.9-stdlib]', 'Package[libidn11]', 'Package[libldap-2.4-2]', 'Package[liburing1]', 'Package[libwebp6]', 'Package[libcbor0]', 'Package[libusb-0.1-4]', 'Package[telnet]', 'Package[libruby2.7]', 'Package[libdns-export1110]', 'Package[libisc-export1105]', 'Package[libbpf0]', 'Package[openssh-client]', 'Package[openssh-server]', 'Package[debdeploy-client]', 'Package[python3-dateutil]', 'Package[sudo]', 'Package[golang-cfssl]', 'Package[debmonitor-client]', 'Package[nagios-nrpe-server]', 'Package[monitoring-plugins]', 'Package[monitoring-plugins-basic]', 'Package[monitoring-plugins-standard]', 'Package[liburiparser1]', 'Package[python3-attr]', 'Package[iucode-tool]', 'Package[freeipmi-tools]', 'Package[freeipmi-ipmiseld]', 'Package[rsyslog-kafka]', 'Package[emacs-nox]', 'Package[prometheus-ipmi-exporter]', 'Package[bacula-fd]', 'Package[libnet-dns-perl]', 'Package[iptables]', 'Package[ferm]', 'Package[nftables]', 'Package[conntrack]', 'Package[openjdk-17-dbg]', 'Package[python3-virtualenv]', 'Package[virtualenv]', 'Package[python3-pip]', 'Package[apache2]', 'Package[links]', 'Package[envoyproxy]', 'Package[prometheus-rsyslog-exporter]', 'Package[initramfs-tools]', 'Package[python3-click]', 'Package[python3-box]', 'Package[confd]', 'Package[python3-toml]', 'Package[openjdk-17-jdk]', 'Package[git-lfs]', 'Package[rsync]', 'Package[python3-venv]', 'Package[gerrit/gerrit]', 'Package[gervert/deploy]', 'Package[stunnel4]', 'Package[mtail]', 'Package[prometheus-apache-exporter]']
File[/usr/local/sbin/sync-gerrit-home]
- Parameters differences:
--- File[/usr/local/sbin/sync-gerrit-home].orig
+++ File[/usr/local/sbin/sync-gerrit-home]
+ group => root
+ mode => 0755
+ owner => root
+ ensure => present
- Content differences:
--- /usr/local/sbin/sync-gerrit-home.orig
+++ /usr/local/sbin/sync-gerrit-home
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/rsync --rsh /usr/local/sbin/sync-gerrit-home-ssl-wrapper -a --chown=gerrit:gerrit rsync://gerrit2003.wikimedia.org/gerrit-home /srv/home-gerrit2003.wikimedia.org/
- Service[rsync-gerrit-home.timer]
- Parameters differences:
--- Service[rsync-gerrit-home.timer].orig
+++ Service[rsync-gerrit-home.timer]
+ enable => False
+ provider => systemd
+ before => ['Exec[systemd daemon-reload for rsync-gerrit-home.timer (rsync-gerrit-home.timer)]']
+ ensure => stopped
- Concat::Fragment[/etc/rsyncd.conf-header]
- Parameters differences:
--- Concat::Fragment[/etc/rsyncd.conf-header].orig
+++ Concat::Fragment[/etc/rsyncd.conf-header]
- order => 01
- target => /etc/rsyncd.conf
- Ferm::Service[rsyncd_access_gerrit_home]
- Parameters differences:
--- Ferm::Service[rsyncd_access_gerrit_home].orig
+++ Ferm::Service[rsyncd_access_gerrit_home]
- srange => ['gerrit2003.wikimedia.org']
- prio => 10
- port => [873, 1873]
- unrestricted_access => False
- notrack => False
- ensure => present
- proto => tcp
- desc =>
- Systemd::Timer::Job[rsync-gerrit-home]
- Parameters differences:
--- Systemd::Timer::Job[rsync-gerrit-home].orig
+++ Systemd::Timer::Job[rsync-gerrit-home]
+ send_mail_to => root@gerrit2002.wikimedia.org
+ monitoring_enabled => False
+ monitoring_contact_groups => admins
+ command => /usr/local/sbin/sync-gerrit-home
+ logfile_perms => all
+ private_tmp => False
+ ignore_errors => False
+ logfile_group => root
+ ensure => absent
+ interval => {'start': 'OnCalendar', 'interval': '*-*-* *:00/10:00'}
+ environment => {}
+ logging_enabled => True
+ success_exit_status => [24]
+ logfile_basedir => /var/log
+ description => Transfer data periodically between hosts
+ user => root
+ fixed_random_delay => False
+ send_mail => False
+ syslog_match_startswith => True
+ send_mail_only_on_error => True
+ monitoring_notes_url => https://wikitech.wikimedia.org/wiki/Monitoring/systemd_unit_state
+ syslog_force_stop => True
+ logfile_name => syslog.log
- File[/etc/rsyslog.d/40-rsync-gerrit-home.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-rsync-gerrit-home.conf].orig
+++ File[/etc/rsyslog.d/40-rsync-gerrit-home.conf]
+ mode => 0444
+ notify => Service[rsyslog]
+ group => root
+ owner => root
+ ensure => absent
- Content differences:
--- /etc/rsyslog.d/40-rsync-gerrit-home.conf.orig
+++ /etc/rsyslog.d/40-rsync-gerrit-home.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "rsync-gerrit-home" then {
+ action(
+ type="omfile" file="/var/log/rsync-gerrit-home/syslog.log"
+ fileOwner="root" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- File[/etc/rsyslog.d/40-rsync-gerrit-data.conf]
- Parameters differences:
--- File[/etc/rsyslog.d/40-rsync-gerrit-data.conf].orig
+++ File[/etc/rsyslog.d/40-rsync-gerrit-data.conf]
+ mode => 0444
+ notify => Service[rsyslog]
+ group => root
+ owner => root
+ ensure => absent
- Content differences:
--- /etc/rsyslog.d/40-rsync-gerrit-data.conf.orig
+++ /etc/rsyslog.d/40-rsync-gerrit-data.conf
@@ -0,0 +1,10 @@
+# rsyslog.conf(5) configuration file for services.
+# This file is managed by Puppet.
+if $programname startswith "rsync-gerrit-data" then {
+ action(
+ type="omfile" file="/var/log/rsync-gerrit-data/syslog.log"
+ fileOwner="root" fileGroup="root"
+ fileCreateMode="0644"
+ )
+ & stop
+}
- Systemd::Timer[rsync-gerrit-data]
- Parameters differences:
--- Systemd::Timer[rsync-gerrit-data].orig
+++ Systemd::Timer[rsync-gerrit-data]
+ unit_name => rsync-gerrit-data.service
+ fixed_random_delay => False
+ timer_intervals => [{'start': 'OnCalendar', 'interval': '*-*-* *:00/10:00'}]
+ accuracy => 15sec
+ splay => 0
+ ensure => absent
- Concat::Fragment[/etc/rsyncd.conf-gerrit-home]
- Parameters differences:
--- Concat::Fragment[/etc/rsyncd.conf-gerrit-home].orig
+++ Concat::Fragment[/etc/rsyncd.conf-gerrit-home]
- order => 10
- target => /etc/rsyncd.conf
- File[/lib/systemd/system/rsync-gerrit-data.timer]
- Parameters differences:
--- File[/lib/systemd/system/rsync-gerrit-data.timer].orig
+++ File[/lib/systemd/system/rsync-gerrit-data.timer]
+ mode => 0444
+ notify => Exec[systemd daemon-reload for rsync-gerrit-data.timer (rsync-gerrit-data.timer)]
+ group => root
+ owner => root
+ ensure => absent
- Content differences:
--- /lib/systemd/system/rsync-gerrit-data.timer.orig
+++ /lib/systemd/system/rsync-gerrit-data.timer
@@ -0,0 +1,12 @@
+[Unit]
+Description=Periodic execution of rsync-gerrit-data.service
+
+[Timer]
+Unit=rsync-gerrit-data.service
+# Accuracy sets the maximum time interval around the execution time we want to allow
+AccuracySec=15sec
+OnCalendar=*-*-* *:00/10:00
+RandomizedDelaySec=0
+
+[Install]
+WantedBy=multi-user.target
- Systemd::Unit[rsync-gerrit-home.timer]
- Parameters differences:
--- Systemd::Unit[rsync-gerrit-home.timer].orig
+++ Systemd::Unit[rsync-gerrit-home.timer]
+ restart => False
+ unit => rsync-gerrit-home.timer
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
+ override => False
+ ensure => absent
- Systemd::Syslog[rsync-gerrit-data]
- Parameters differences:
--- Systemd::Syslog[rsync-gerrit-data].orig
+++ Systemd::Syslog[rsync-gerrit-data]
+ force_stop => True
+ group => root
+ programname_comparison => startswith
+ owner => root
+ ensure => absent
+ readable_by => all
+ base_dir => /var/log
+ log_filename => syslog.log
- Systemd::Service[rsync-gerrit-data]
- Parameters differences:
--- Systemd::Service[rsync-gerrit-data].orig
+++ Systemd::Service[rsync-gerrit-data]
+ service_params => {}
+ monitoring_enabled => False
+ unit_type => timer
+ monitoring_contact_group => admins
+ ensure => absent
+ restart => False
+ migration_task => T407130
+ monitoring_critical => False
+ require => Systemd::Unit[rsync-gerrit-data.service]
+ override => False
- Exec[systemd daemon-reload for rsync-gerrit-data.timer (rsync-gerrit-data.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for rsync-gerrit-data.timer (rsync-gerrit-data.timer)].orig
+++ Exec[systemd daemon-reload for rsync-gerrit-data.timer (rsync-gerrit-data.timer)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- Rsync::Quickdatacopy[gerrit-home]
- Parameters differences:
--- Rsync::Quickdatacopy[gerrit-home].orig
+++ Rsync::Quickdatacopy[gerrit-home]
+ auto_interval => {'start': 'OnCalendar', 'interval': '*-*-* *:00/10:00'}
+ dest_host => gerrit2002.wikimedia.org
+ auto_sync => False
+ ensure => present
+ module_path => /srv/home-gerrit2003.wikimedia.org
+ delete => False
+ ignore_missing_file_errors => True
+ progress => False
+ source_host => gerrit2003.wikimedia.org
+ chown => gerrit:gerrit
+ server_uses_stunnel => True
- Systemd::Service[rsync-gerrit-home]
- Parameters differences:
--- Systemd::Service[rsync-gerrit-home].orig
+++ Systemd::Service[rsync-gerrit-home]
+ service_params => {}
+ monitoring_enabled => False
+ unit_type => timer
+ monitoring_contact_group => admins
+ ensure => absent
+ restart => False
+ migration_task => T407130
+ monitoring_critical => False
+ require => Systemd::Unit[rsync-gerrit-home.service]
+ override => False
- Nftables::Service[rsyncd_access_gerrit-home]
- Parameters differences:
--- Nftables::Service[rsyncd_access_gerrit-home].orig
+++ Nftables::Service[rsyncd_access_gerrit-home]
- prio => 10
- port => [873, 1873]
- unrestricted_access => False
- notrack => False
- ensure => present
- proto => tcp
- src_ips => ['208.80.153.116', '2620:0:860:4:208:80:153:116']
- desc =>
- File[/etc/logrotate.d/rsync-gerrit-data]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-gerrit-data].orig
+++ File[/etc/logrotate.d/rsync-gerrit-data]
+ group => root
+ mode => 0444
+ owner => root
+ ensure => absent
- Content differences:
--- /etc/logrotate.d/rsync-gerrit-data.orig
+++ /etc/logrotate.d/rsync-gerrit-data
@@ -0,0 +1,12 @@
+# logrotate(8) config for rsync-gerrit-data
+
+/var/log/rsync-gerrit-data/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- Systemd::Unit[rsync-gerrit-data.timer]
- Parameters differences:
--- Systemd::Unit[rsync-gerrit-data.timer].orig
+++ Systemd::Unit[rsync-gerrit-data.timer]
+ restart => False
+ unit => rsync-gerrit-data.timer
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
+ override => False
+ ensure => absent
- File[/var/log/rsync-gerrit-home]
- Parameters differences:
--- File[/var/log/rsync-gerrit-home].orig
+++ File[/var/log/rsync-gerrit-home]
+ mode => 0755
+ backup => False
+ group => root
+ force => True
+ owner => root
+ ensure => absent
- Systemd::Syslog[rsync-gerrit-home]
- Parameters differences:
--- Systemd::Syslog[rsync-gerrit-home].orig
+++ Systemd::Syslog[rsync-gerrit-home]
+ force_stop => True
+ group => root
+ programname_comparison => startswith
+ owner => root
+ ensure => absent
+ readable_by => all
+ base_dir => /var/log
+ log_filename => syslog.log
- Systemd::Unit[rsync-gerrit-home.service]
- Parameters differences:
--- Systemd::Unit[rsync-gerrit-home.service].orig
+++ Systemd::Unit[rsync-gerrit-home.service]
+ restart => False
+ unit => rsync-gerrit-home.service
+ override_filename => puppet-override.conf
+ require => ['Class[Systemd]']
+ override => False
+ ensure => absent
- Concat::Fragment[/etc/rsyncd.conf-gerrit-data]
- Parameters differences:
--- Concat::Fragment[/etc/rsyncd.conf-gerrit-data].orig
+++ Concat::Fragment[/etc/rsyncd.conf-gerrit-data]
- order => 10
- target => /etc/rsyncd.conf
- Exec[systemd daemon-reload for rsync-gerrit-home.timer (rsync-gerrit-home.timer)]
- Parameters differences:
--- Exec[systemd daemon-reload for rsync-gerrit-home.timer (rsync-gerrit-home.timer)].orig
+++ Exec[systemd daemon-reload for rsync-gerrit-home.timer (rsync-gerrit-home.timer)]
+ command => /bin/systemctl daemon-reload
+ refreshonly => True
- File[/etc/logrotate.d/rsync-gerrit-home]
- Parameters differences:
--- File[/etc/logrotate.d/rsync-gerrit-home].orig
+++ File[/etc/logrotate.d/rsync-gerrit-home]
+ group => root
+ mode => 0444
+ owner => root
+ ensure => absent
- Content differences:
--- /etc/logrotate.d/rsync-gerrit-home.orig
+++ /etc/logrotate.d/rsync-gerrit-home
@@ -0,0 +1,12 @@
+# logrotate(8) config for rsync-gerrit-home
+
+/var/log/rsync-gerrit-home/*.log {
+ daily
+ copytruncate
+ missingok
+ compress
+ delaycompress
+ notifempty
+ rotate 15
+ size 256M
+}
- File[/usr/local/sbin/sync-gerrit-home-ssl-wrapper]
- Parameters differences:
--- File[/usr/local/sbin/sync-gerrit-home-ssl-wrapper].orig
+++ File[/usr/local/sbin/sync-gerrit-home-ssl-wrapper]
+ group => root
+ mode => 0755
+ owner => root
+ ensure => present
- Content differences:
--- /usr/local/sbin/sync-gerrit-home-ssl-wrapper.orig
+++ /usr/local/sbin/sync-gerrit-home-ssl-wrapper
@@ -0,0 +1,29 @@
+#!/bin/sh
+# This file is managed by Puppet
+#
+# This script is expected to be used as the --rsh argument to rsync.
+# It will wrap rsync's communication in stunnel, and validate the
+# server's cert vs the Puppet CA.
+
+set -eu
+
+cleanup() {
+ [ -f "$CONFIG" ] && rm -f "$CONFIG"
+}
+trap cleanup EXIT
+
+CONFIG=$(mktemp -t sync-ssl-wrapper.stunnel.conf.XXXXXXXX)
+
+RSYNC_SSL_PORT=${RSYNC_SSL_PORT:-1873}
+
+cat > "$CONFIG" <<EOF
+foreground = yes
+client = yes
+connect = $1:$RSYNC_SSL_PORT
+CAfile = /var/lib/puppet/ssl/certs/ca.pem
+cert = /var/lib/puppet/ssl/certs/gerrit2002.wikimedia.org.pem
+key = /var/lib/puppet/ssl/private_keys/gerrit2002.wikimedia.org.pem
+verifyChain = yes
+EOF
+
+/usr/bin/stunnel4 "$CONFIG"
- Concat_fragment[/etc/rsyncd.conf-header]
- Parameters differences:
--- Concat_fragment[/etc/rsyncd.conf-header].orig
+++ Concat_fragment[/etc/rsyncd.conf-header]
- tag => _etc_rsyncd.conf
- order => 01
- target => /etc/rsyncd.conf
- Content differences:
--- /etc/rsyncd.conf-header.orig
+++ /etc/rsyncd.conf-header
@@ -1,11 +0,0 @@
-# This file is being maintained by Puppet.
-# DO NOT EDIT
-
-uid = nobody
-gid = nogroup
-use chroot = yes
-
-log format = %t %a %m %f %b
-syslog facility = local3
-timeout = 300
-address = 0.0.0.0
- File[/etc/default/rsync]
- Parameters differences:
--- File[/etc/default/rsync].orig
+++ File[/etc/default/rsync]
- group => root
- mode => 0444
- owner => root
- ensure => present
- Content differences:
--- /etc/default/rsync.orig
+++ /etc/default/rsync
@@ -1,46 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///rsync/rsync.default.erb
-#####################################################################
-
-# defaults file for rsync daemon mode
-
-# start rsync in daemon mode from init.d script?
-# only allowed values are "true", "false", and "inetd"
-# Use "inetd" if you want to start the rsyncd from inetd,
-# all this does is prevent the init.d script from printing a message
-# about not starting rsyncd (you still need to modify inetd's config yourself).
-RSYNC_ENABLE=true
-
-# which file should be used as the configuration file for rsync.
-# This file is used instead of the default /etc/rsyncd.conf
-# Warning: This option has no effect if the daemon is accessed
-# using a remote shell. When using a different file for
-# rsync you might want to symlink /etc/rsyncd.conf to
-# that file.
-RSYNC_CONFIG_FILE=/etc/rsyncd.conf
-
-# what extra options to give rsync --daemon?
-# that excludes the --daemon; that's always done in the init.d script
-# Possibilities are:
-# --address=123.45.67.89 (bind to a specific IP address)
-# --port=8730 (bind to specified port; default 873)
-RSYNC_OPTS=''
-
-# run rsyncd at a nice level?
-# the rsync daemon can impact performance due to much I/O and CPU usage,
-# so you may want to run it at a nicer priority than the default priority.
-# Allowed values are 0 - 19 inclusive; 10 is a reasonable value.
-RSYNC_NICE=''
-
-# run rsyncd with ionice?
-# "ionice" does for IO load what "nice" does for CPU load.
-# As rsync is often used for backups which aren't all that time-critical,
-# reducing the rsync IO priority will benefit the rest of the system.
-# See the manpage for ionice for allowed options.
-# -c3 is recommended, this will run rsync IO at "idle" priority. Uncomment
-# the next line to activate this.
-# RSYNC_IONICE='-c3'
-
-# Don't forget to create an appropriate config file,
-# else the daemon will not start.
- Concat[/etc/rsyncd.conf]
- Parameters differences:
--- Concat[/etc/rsyncd.conf].orig
+++ Concat[/etc/rsyncd.conf]
- ensure_newline => False
- mode => 0444
- format => plain
- group => root
- owner => root
- ensure => present
- path => /etc/rsyncd.conf
- show_diff => True
- order => alpha
- warn => False
- force => False
- replace => True
- backup => puppet
- File[/etc/nftables/input/10_rsyncd_access_gerrit-home.nft]
- Parameters differences:
--- File[/etc/nftables/input/10_rsyncd_access_gerrit-home.nft].orig
+++ File[/etc/nftables/input/10_rsyncd_access_gerrit-home.nft]
- tag => nft
- mode => 0444
- notify => ['Service[nftables]']
- group => root
- owner => root
- ensure => present
- Content differences:
--- /etc/nftables/input/10_rsyncd_access_gerrit-home.nft.orig
+++ /etc/nftables/input/10_rsyncd_access_gerrit-home.nft
@@ -1,4 +0,0 @@
-# Managed by puppet
-#
-ip saddr { 208.80.153.116 } tcp dport { 873, 1873 } accept
-ip6 saddr { 2620:0:860:4:208:80:153:116 } tcp dport { 873, 1873 } accept
- Concat_file[/etc/rsyncd.conf]
- Parameters differences:
--- Concat_file[/etc/rsyncd.conf].orig
+++ Concat_file[/etc/rsyncd.conf]
- tag => _etc_rsyncd.conf
- ensure_newline => False
- mode => 0444
- format => plain
- group => root
- owner => root
- show_diff => True
- order => alpha
- force => False
- replace => True
- backup => puppet
- Rsync::Quickdatacopy[gerrit-data]
- Parameters differences:
--- Rsync::Quickdatacopy[gerrit-data].orig
+++ Rsync::Quickdatacopy[gerrit-data]
+ auto_interval => {'start': 'OnCalendar', 'interval': '*-*-* *:00/10:00'}
+ dest_host => gerrit2002.wikimedia.org
+ auto_sync => False
+ ensure => present
+ module_path => /srv/gerrit
+ delete => False
+ ignore_missing_file_errors => True
+ progress => False
+ source_host => gerrit2003.wikimedia.org
+ chown => gerrit:gerrit
+ server_uses_stunnel => True