Dzahn has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334241 )
Change subject: aptrepo: rsync cron (WIP) ...................................................................... aptrepo: rsync cron (WIP) Change-Id: I0f3570890d5c949db98763b3f1ad5bcb0f35d23c --- M hieradata/common.yaml M modules/aptrepo/manifests/rsync.pp 2 files changed, 19 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/334241/1 diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 91638ec..2f6711a 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -453,3 +453,4 @@ deployment_server: tin.eqiad.wmnet install_server: carbon.wikimedia.org +install_server_failover: install2001.wikimedia.org diff --git a/modules/aptrepo/manifests/rsync.pp b/modules/aptrepo/manifests/rsync.pp index d8b333c..0f6c4d5 100644 --- a/modules/aptrepo/manifests/rsync.pp +++ b/modules/aptrepo/manifests/rsync.pp @@ -3,27 +3,41 @@ class aptrepo::rsync { $primary_server = hiera('install_server', 'install1001.wikimedia.org') + $secondary_server = hiera('install_server_failover', 'install2001.wikimedia.org') # only activate rsync/firewall hole on the server that is NOT active if $::fqdn != $primary_server { - $ensure = 'present' + $ensure_ferm = 'present' + $ensure_cron = 'absent' + $ensure_sync = 'present' + include rsync::server rsync::server::module { 'aptrepo': - ensure => $aptrepo::rsync::ensure, + ensure => $ensure_sync, path => $aptrepo::basedir, read_only => 'no', hosts_allow => $primary_server, } } else { - $ensure = 'absent' + $ensure_ferm = 'absent' + $ensure_cron = 'present' + $ensure_sync = 'absent' } ferm::service { 'aptrepo-rsync': - ensure => $aptrepo::rsync::ensure, + ensure => $ensure_ferm, proto => 'tcp', port => '873', srange => "@resolve(${primary_server})", } + + cron { 'rsync-aptrepo + ensure => $ensure_cron, + user => 'root', + command => "rsync -avp ${aptrepo::basedir} rsync://${secondary_server}/aptrepo', + hour => '*/6', + minute => '42', + } } -- To view, visit https://gerrit.wikimedia.org/r/334241 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f3570890d5c949db98763b3f1ad5bcb0f35d23c Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits