Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53957
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, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/53957/1
diff --git a/modules/contint/manifests/website.pp
b/modules/contint/manifests/website.pp
index 29b03c6..0616d06 100644
--- a/modules/contint/manifests/website.pp
+++ b/modules/contint/manifests/website.pp
@@ -8,20 +8,20 @@
file { '/srv/org':
ensure => directory,
mode => '0755',
- owner => 'www-data',
+ owner => 'jenkins',
group => 'wikidev',
}
file { '/srv/org/mediawiki':
ensure => directory,
mode => '0755',
- owner => 'www-data',
+ owner => 'jenkins',
group => 'wikidev',
}
file { '/srv/org/mediawiki/integration':
ensure => directory,
mode => '0755',
- owner => 'www-data',
+ owner => 'jenkins',
group => 'wikidev',
}
# MediaWiki code coverage
@@ -46,14 +46,14 @@
file { '/srv/org/wikimedia':
ensure => directory,
mode => '0755',
- owner => 'www-data',
+ owner => 'jenkins',
group => 'wikidev',
}
file { '/srv/localhost':
ensure => directory,
mode => '0755',
- owner => 'www-data',
+ owner => 'jenkins',
group => 'wikidev',
}
file { '/srv/localhost/qunit':
--
To view, visit https://gerrit.wikimedia.org/r/53957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I945f97e3b86b8a551479e1a6dec5c4b22feb11ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
