20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/198461
Change subject: fix puppet error due to missing parent directory
......................................................................
fix puppet error due to missing parent directory
Just spun up a new phab instance in labs and there is a puppet
failure due to creating /var/run/phd/pid without creating it's
parent directory.
This should fix that by naming the parent directory in the config
and using it to create /var/run/phd plus /var/run/phd/pid
Change-Id: I2db11a7e70c0db2cddde763cb3015da32718450a
---
M modules/phabricator/data/fixed_settings.yaml
M modules/phabricator/manifests/phd.pp
2 files changed, 9 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/198461/1
diff --git a/modules/phabricator/data/fixed_settings.yaml
b/modules/phabricator/data/fixed_settings.yaml
index 03fca3b..886ea70 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -191,7 +191,7 @@
PhabricatorApplicationPhriction: true
PhabricatorApplicationDiviner: true
-phd.pid-directory: "/var/run/phd/pid"
+phd.run-directory: "/var/run/phd"
phd.log-directory: "/var/log/phd"
phd.user: 'phd'
diff --git a/modules/phabricator/manifests/phd.pp
b/modules/phabricator/manifests/phd.pp
index 4cb960e..1cd922c 100644
--- a/modules/phabricator/manifests/phd.pp
+++ b/modules/phabricator/manifests/phd.pp
@@ -7,13 +7,20 @@
$settings = {},
$basedir = '/',
) {
+ $run_dir = $settings['phd.run-directory']
file { '/etc/init.d/phd':
ensure => 'link',
target => "${basedir}/phabricator/bin/phd",
}
- file { $settings['phd.pid-directory']:
+ file { $run_dir:
+ ensure => 'directory',
+ owner => $settings['phd.user'],
+ group => 'phd',
+ }
+ ->
+ file { "${run_dir}/pid":
ensure => 'directory',
owner => $settings['phd.user'],
group => 'phd',
--
To view, visit https://gerrit.wikimedia.org/r/198461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2db11a7e70c0db2cddde763cb3015da32718450a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
