Alexandros Kosiaris has submitted this change and it was merged.
Change subject: simplify annualreport module
......................................................................
simplify annualreport module
The file resource is anyway defined by git::clone so it is redundant,
removing it. There is no reason for the git repo's owner to be www-data,
removing it and defaulting to root
Change-Id: I4134103ddafd3683964d27d3d797cb9d1b126171
---
M modules/annualreport/manifests/init.pp
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/annualreport/manifests/init.pp
b/modules/annualreport/manifests/init.pp
index 338c338..bd82d14 100644
--- a/modules/annualreport/manifests/init.pp
+++ b/modules/annualreport/manifests/init.pp
@@ -5,13 +5,6 @@
include ::apache
include ::apache::mod::headers
- file { '/srv/org/wikimedia/annualreport':
- ensure => directory,
- owner => 'root',
- group => 'root',
- mode => '0755',
- }
-
apache::site { 'annual.wikimedia.org':
source => 'puppet:///modules/annualreport/annual.wikimedia.org',
}
@@ -24,8 +17,5 @@
ensure => 'latest',
directory => '/srv/org/wikimedia/annualreport',
branch => 'master',
- owner => 'www-data',
- group => 'www-data',
- require => File['/srv/org/wikimedia/annualreport'],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/265487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4134103ddafd3683964d27d3d797cb9d1b126171
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
