Andrew Bogott has submitted this change and it was merged.
Change subject: contint: Fix permissions in /srv.
......................................................................
contint: Fix permissions in /srv.
The /srv directory on the contint server is now a git-clone
of integration/docroot.git, which is deployed on-merge by
Jenkins.
These file resources should probably go away, but for now keeping
them so that the apache conf point to directories that exist
regardless of the state of the docroot.git repository.
However do need to be owned by jenkins because right now
every deploy to docroot is failing as git (under user jenkins)
is unable to do anything with the working copy as long as puppet
is restoring ownership and locking it out of the tree.
Change-Id: I945f97e3b86b8a551479e1a6dec5c4b22feb11ba
---
M modules/contint/manifests/website.pp
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Checked; Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 29b03c6..bb9cba7 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -7,29 +7,29 @@
# This is mostly to get the files properly setup
file { '/srv/org':
ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
}
file { '/srv/org/mediawiki':
ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
}
file { '/srv/org/mediawiki/integration':
ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
}
# MediaWiki code coverage
file { '/srv/org/mediawiki/integration/coverage':
ensure => directory,
mode => '0775',
owner => 'jenkins',
- group => 'wikidev',
+ group => 'jenkins',
}
# Apache configuration for integration.mediawiki.org
@@ -45,22 +45,22 @@
file { '/srv/org/wikimedia':
ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
}
file { '/srv/localhost':
ensure => directory,
- mode => '0755',
- owner => 'www-data',
- group => 'wikidev',
+ mode => '0775',
+ owner => 'jenkins',
+ group => 'jenkins',
}
file { '/srv/localhost/qunit':
ensure => directory,
- mode => '0755',
+ mode => '0775',
owner => 'jenkins',
- group => 'wikidev',
+ group => 'jenkins',
}
# Apache configuration for a virtual host on localhost
--
To view, visit https://gerrit.wikimedia.org/r/53957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I945f97e3b86b8a551479e1a6dec5c4b22feb11ba
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
