20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226031
Change subject: Ensure that phabricator/src/extensions exists
......................................................................
Ensure that phabricator/src/extensions exists
Gotta have the directory created before adding symlinks there. This
should fix T104904.
Bug: T104904
Change-Id: I9b9e21a7b51f8a5c9edf797679dc03faf589aad1
---
M modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
2 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/226031/1
diff --git a/modules/phabricator/manifests/extension.pp
b/modules/phabricator/manifests/extension.pp
index 05387110..a368f3f 100644
--- a/modules/phabricator/manifests/extension.pp
+++ b/modules/phabricator/manifests/extension.pp
@@ -9,5 +9,6 @@
file { "${rootdir}/phabricator/src/extensions/${name}":
ensure => link,
target => "${rootdir}/extensions/${name}",
+ require => "${rootdir}/phabricator/src/extensions/"
}
}
diff --git a/modules/phabricator/manifests/init.pp
b/modules/phabricator/manifests/init.pp
index 658b635..6abfff1 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -222,6 +222,15 @@
before => Git::Install['phabricator/phabricator'],
}
+ file { "${$phabdir}/phabricator/src/extensions/":
+ ensure => 'directory',
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ require => Git::Install['phabricator/extensions'],
+ before => Phabricator::Extension["$extensions"],
+ }
+
exec {$ext_lock_path:
command => "touch ${ext_lock_path}",
unless => "test -z ${ext_lock_path} || test -e ${ext_lock_path}",
--
To view, visit https://gerrit.wikimedia.org/r/226031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b9e21a7b51f8a5c9edf797679dc03faf589aad1
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
