ArielGlenn has submitted this change and it was merged.
Change subject: datasets: add the dirs vars manifest, never got committed, woops
......................................................................
datasets: add the dirs vars manifest, never got committed, woops
also make name of that class consistent with the rest
Change-Id: Ia19fc12036ee3a28f9f00aac56d3a9e3dee37bc7
---
A modules/dataset/manifests/dirs.pp
M modules/dataset/manifests/html.pp
2 files changed, 16 insertions(+), 11 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/dataset/manifests/dirs.pp
b/modules/dataset/manifests/dirs.pp
new file mode 100644
index 0000000..6eeebcc
--- /dev/null
+++ b/modules/dataset/manifests/dirs.pp
@@ -0,0 +1,5 @@
+class dataset::dirs {
+ $datadir = '/data/xmldatadumps'
+ $publicdir = '/data/xmldatadumps/public'
+ $otherdir = '/data/xmldatadumps/pubic/other'
+}
diff --git a/modules/dataset/manifests/html.pp
b/modules/dataset/manifests/html.pp
index f0209d0..a644bf0 100644
--- a/modules/dataset/manifests/html.pp
+++ b/modules/dataset/manifests/html.pp
@@ -9,7 +9,7 @@
include dataset::dirs
if ($other) {
- file { "${datasets::dirs::otherdir}/index.html":
+ file { "${dataset::dirs::otherdir}/index.html":
ensure => 'present',
path => "${datassets::dirs::otherdir}/index.html",
mode => '0644',
@@ -19,9 +19,9 @@
}
}
if ($pagestats_ez) {
- file { "${datasets::dirs::otherdir}/pagestats-ez/index.html":
+ file { "${dataset::dirs::otherdir}/pagestats-ez/index.html":
ensure => 'present',
- path => "${datasets::dirs::otherdir}/pagestats-ez/index.html",
+ path => "${dataset::dirs::otherdir}/pagestats-ez/index.html",
mode => '0644',
owner => 'root',
group => 'root',
@@ -29,9 +29,9 @@
}
}
if ($poty) {
- file { "${datasets::dirs::otherdir}/poty/index.html":
+ file { "${dataset::dirs::otherdir}/poty/index.html":
ensure => 'present',
- path => "${datasets::dirs::otherdir}/poty/index.html",
+ path => "${dataset::dirs::otherdir}/poty/index.html",
mode => '0644',
owner => 'root',
group => 'root',
@@ -39,9 +39,9 @@
}
}
if ($archive) {
- file { "${datasets::dirs::publicdir}/archive/index.html":
+ file { "${dataset::dirs::publicdir}/archive/index.html":
ensure => 'present',
- path => "${datasets::dirs::publicdir}/archive/index.html",
+ path => "${dataset::dirs::publicdir}/archive/index.html",
mode => '0644',
owner => 'root',
group => 'root',
@@ -49,18 +49,18 @@
}
}
if ($public) {
- file { "${datasets::dirs::publicdir}/index.html":
+ file { "${dataset::dirs::publicdir}/index.html":
ensure => 'present',
- path => "${datasets::dirs::publicdir}/index.html",
+ path => "${dataset::dirs::publicdir}/index.html",
mode => '0644',
owner => 'root',
group => 'root',
source => 'puppet:///modules/dataset/html/public_index.html',
}
- file { "${datasets::dirs::publicdir}/mirrors.html":
+ file { "${dataset::dirs::publicdir}/mirrors.html":
ensure => 'present',
- path => "${datasets::dirs::publicdir}/mirrors.html",
+ path => "${dataset::dirs::publicdir}/mirrors.html",
mode => '0644',
owner => 'root',
group => 'root',
--
To view, visit https://gerrit.wikimedia.org/r/190440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia19fc12036ee3a28f9f00aac56d3a9e3dee37bc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
