Alexandros Kosiaris has submitted this change and it was merged.
Change subject: annualreport: move apache site from template to file + minor
lint
......................................................................
annualreport: move apache site from template to file + minor lint
Change-Id: Iaeeb0c41158c4ec7abdf44826f5c4792e2191e3a
---
R modules/annualreport/files/annual.wikimedia.org
M modules/annualreport/manifests/init.pp
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/annualreport/templates/annual.wikimedia.org.erb
b/modules/annualreport/files/annual.wikimedia.org
similarity index 100%
rename from modules/annualreport/templates/annual.wikimedia.org.erb
rename to modules/annualreport/files/annual.wikimedia.org
diff --git a/modules/annualreport/manifests/init.pp
b/modules/annualreport/manifests/init.pp
index 7907671..9152b70 100644
--- a/modules/annualreport/manifests/init.pp
+++ b/modules/annualreport/manifests/init.pp
@@ -5,14 +5,14 @@
include ::apache
file { '/srv/org/wikimedia/annualreport':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755';
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
apache::site { 'annual.wikimedia.org':
- content => template('annualreport/annual.wikimedia.org.erb'),
+ source => 'puppet:///modules/annualreport/annual.wikimedia.org',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/190787
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeeb0c41158c4ec7abdf44826f5c4792e2191e3a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
