Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/319368
Change subject: mirrors: config ftpsync for mirroring from debian.org
......................................................................
mirrors: config ftpsync for mirroring from debian.org
Pull directly from a Debian syncproxy, rather than a secondary
third-party hosted mirror. First step towards becoming a push mirror.
Change-Id: I8b97ff5cd2698d0e557311811f08acd9090dc787
---
D modules/mirrors/files/ftpsync.conf
M modules/mirrors/manifests/debian.pp
A modules/mirrors/templates/ftpsync.conf.erb
3 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/319368/1
diff --git a/modules/mirrors/files/ftpsync.conf
b/modules/mirrors/files/ftpsync.conf
deleted file mode 100644
index 9680cad..0000000
--- a/modules/mirrors/files/ftpsync.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-MIRRORNAME="mirrors.wikimedia.org"
-TO="/srv/mirrors/debian/"
-RSYNC_PATH="debian"
-RSYNC_HOST="ftp2.us.debian.org"
-
-MAILTO="root"
-ERRORSONLY="true"
-FULLLOGS="false"
-LOGROTATE=14
diff --git a/modules/mirrors/manifests/debian.pp
b/modules/mirrors/manifests/debian.pp
index 430681f..636af06 100644
--- a/modules/mirrors/manifests/debian.pp
+++ b/modules/mirrors/manifests/debian.pp
@@ -14,6 +14,7 @@
class mirrors::debian {
require mirrors
+ include passwords::mirrors
file { '/srv/mirrors/debian':
ensure => directory,
@@ -50,7 +51,7 @@
owner => 'mirror',
group => 'mirror',
mode => '0555',
- source => 'puppet:///modules/mirrors/ftpsync.conf',
+ content => template('mirrors/ftpsync.conf.erb'),
}
cron { 'update-debian-mirror':
diff --git a/modules/mirrors/templates/ftpsync.conf.erb
b/modules/mirrors/templates/ftpsync.conf.erb
new file mode 100644
index 0000000..322c8c2
--- /dev/null
+++ b/modules/mirrors/templates/ftpsync.conf.erb
@@ -0,0 +1,11 @@
+MIRRORNAME="mirrors.wikimedia.org"
+TO="/srv/mirrors/debian/"
+RSYNC_PATH="debian"
+RSYNC_HOST="syncproxy.cna.debian.org"
+RSYNC_USER="<%= scope.lookupvar("passwords::mirrors::debian_rsync_username")
%>"
+RSYNC_PASSWORD="<%=
scope.lookupvar("passwords::mirrors::debian_rsync_password") %>"
+
+MAILTO="root"
+ERRORSONLY="true"
+FULLLOGS="false"
+LOGROTATE=14
--
To view, visit https://gerrit.wikimedia.org/r/319368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b97ff5cd2698d0e557311811f08acd9090dc787
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
