Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289228
Change subject: mirrors: mirror Tails as well
......................................................................
mirrors: mirror Tails as well
Change-Id: I7d7f4e0a645c2168436bd01c2ac4c53f4f025b87
---
M manifests/role/installserver.pp
M modules/mirrors/files/index.html
A modules/mirrors/manifests/tails.pp
3 files changed, 40 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/289228/1
diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 7686649..88bd6a4 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -47,6 +47,8 @@
nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror
/srv/mirrors/debian',
}
+ include mirrors::tails
+
include install_server::tftp_server
ferm::rule { 'tftp':
rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
diff --git a/modules/mirrors/files/index.html b/modules/mirrors/files/index.html
index 7c27997..d72f8c2 100644
--- a/modules/mirrors/files/index.html
+++ b/modules/mirrors/files/index.html
@@ -95,9 +95,11 @@
<h2>Contents</h2>
<dl>
<dt><a href="/debian">Debian</a></dt>
- <dd>Mirror of the <a href="//www.debian.org/">Debian project</a>.</dd>
+ <dd>Mirror of the <a href="https://www.debian.org/";>Debian
project</a>.</dd>
<dt><a href="/ubuntu">Ubuntu</a></dt>
- <dd>Mirror of the <a href="//www.ubuntu.com/">Ubuntu</a> operating
system.</dd>
+ <dd>Mirror of the <a href="http://www.ubuntu.com/";>Ubuntu</a>
operating system.</dd>
+ <dt><a href="/tails">Tails</a></dt>
+ <dd>Mirror of the <a href="https://tails.boum.org/";>Tails</a> amnesic
incognito live system.</dd>
</dl>
<div class="visualClear"></div>
</div>
diff --git a/modules/mirrors/manifests/tails.pp
b/modules/mirrors/manifests/tails.pp
new file mode 100644
index 0000000..2187166
--- /dev/null
+++ b/modules/mirrors/manifests/tails.pp
@@ -0,0 +1,34 @@
+# Class: mirrors::tails
+#
+# This class sets up a Tails mirror
+#
+# Parameters:
+#
+# Actions:
+# Populate Tails mirror configuration directory
+#
+# Requires:
+#
+# Sample Usage:
+# include mirrors::tails
+
+class mirrors::tails {
+ require mirrors
+
+ file { '/srv/mirrors/tails':
+ ensure => directory,
+ owner => 'mirror',
+ group => 'mirror',
+ mode => '0755',
+ }
+
+ $rsync_cmd = '/usr/bin/rsync -rt --delete
rsync.torproject.org::amnesia-archive/tails/ /srv/mirrors/tails/'
+
+ cron { 'update-tails-mirror':
+ ensure => present,
+ command => "${rsync_cmd} 1>/dev/null 2>/dev/null",
+ user => 'mirror',
+ hour => '*',
+ minute => '15',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/289228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d7f4e0a645c2168436bd01c2ac4c53f4f025b87
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
