ArielGlenn has submitted this change and it was merged.
Change subject: Revert "kiwix mirror stanza moved to mirror role and added
system_role"
......................................................................
Revert "kiwix mirror stanza moved to mirror role and added system_role"
need to fix duplicate rsync package issue
This reverts commit dbcd26550bf65fdf27a2e7f331713aa07e6884af
Change-Id: Ic5e226b09fbfe227dc611dba3b91745ccf9e4e78
---
M manifests/misc/download.pp
M manifests/role/mirror.pp
M manifests/site.pp
3 files changed, 37 insertions(+), 39 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/download.pp b/manifests/misc/download.pp
index 4eb668e..99db53e 100644
--- a/manifests/misc/download.pp
+++ b/manifests/misc/download.pp
@@ -125,3 +125,39 @@
apache_site { "download.mediawiki.org": name =>
"download.mediawiki.org" }
}
+
+class misc::kiwix-mirror {
+ # TODO: add system_role
+
+ group { mirror:
+ ensure => "present";
+ }
+
+ user { mirror:
+ name => "mirror",
+ gid => "mirror",
+ groups => [ "www-data"],
+ membership => "minimum",
+ home => "/data/home",
+ shell => "/bin/bash";
+ }
+
+ file {
+ "/data/xmldatadumps/public/kiwix":
+ ensure => "/data/xmldatadumps/public/other/kiwix";
+ "/data/xmldatadumps/public/other/kiwix":
+ owner => "mirror",
+ group => "mirror",
+ mode => 0644,
+ ensure => present;
+ }
+
+ cron { kiwix-mirror-update:
+ command => "rsync -vzrlptD
download.kiwix.org::download.kiwix.org/zim/0.9/
/data/xmldatadumps/public/other/kiwix/zim/0.9/ >/dev/null 2>&1",
+ user => mirror,
+ minute => '*/15',
+ ensure => present;
+ }
+
+}
+
diff --git a/manifests/role/mirror.pp b/manifests/role/mirror.pp
index 74c1d7d..f90c753 100644
--- a/manifests/role/mirror.pp
+++ b/manifests/role/mirror.pp
@@ -34,41 +34,3 @@
ensure => present;
}
}
-
-class role::mirror::kiwix {
- include role::mirror::common
-
- system_role { "role::mirror::kiwix": description => "Kiwix mirror" }
-
- group { mirror:
- ensure => "present";
- }
-
- user { mirror:
- name => "mirror",
- gid => "mirror",
- groups => [ "www-data"],
- membership => "minimum",
- home => "/data/home",
- shell => "/bin/bash";
- }
-
- file {
- "/data/xmldatadumps/public/kiwix":
- ensure => "/data/xmldatadumps/public/other/kiwix";
- "/data/xmldatadumps/public/other/kiwix":
- owner => "mirror",
- group => "mirror",
- mode => 0644,
- ensure => present;
- }
-
- cron { kiwix-mirror-update:
- command => "rsync -vzrlptD
download.kiwix.org::download.kiwix.org/zim/0.9/
/data/xmldatadumps/public/other/kiwix/zim/0.9/ >/dev/null 2>&1",
- user => mirror,
- minute => '*/15',
- require => File[ [ '/data/xmldatadumps/public/kiwix',
'/data/xmldatadumps/public/other/kiwix' ] ],
- ensure => present;
- }
-
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index cec414b..ce3bbce 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -381,7 +381,7 @@
accounts::catrope,
misc::download-wikimedia,
misc::download-primary,
- role::mirror::kiwix
+ misc::kiwix-mirror
}
node "dataset1001.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/62965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5e226b09fbfe227dc611dba3b91745ccf9e4e78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
