20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226097
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: Ic1ae541b99e87f17efba517065a88deb70509b37
---
M modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
2 files changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/226097/1
diff --git a/modules/phabricator/manifests/extension.pp
b/modules/phabricator/manifests/extension.pp
index 05387110..923c30e 100644
--- a/modules/phabricator/manifests/extension.pp
+++ b/modules/phabricator/manifests/extension.pp
@@ -7,7 +7,8 @@
define phabricator::extension($rootdir='/') {
file { "${rootdir}/phabricator/src/extensions/${name}":
- ensure => link,
- target => "${rootdir}/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..efe9875 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -222,6 +222,18 @@
before => Git::Install['phabricator/phabricator'],
}
+ file { "${$phabdir}/phabricator/src/extensions":
+ ensure => 'directory',
+ path => "${$phabdir}/phabricator/src/extensions",
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
+ require => [
+ Git::Install['phabricator/extensions'],
+ Git::Install['phabricator/phabricator'],
+ ],
+ }
+
exec {$ext_lock_path:
command => "touch ${ext_lock_path}",
unless => "test -z ${ext_lock_path} || test -e ${ext_lock_path}",
@@ -230,7 +242,7 @@
phabricator::extension { $extensions:
rootdir => $phabdir,
- require => Git::Install['phabricator/extensions'],
+ require => File["${$phabdir}/phabricator/src/extensions"],
}
}
--
To view, visit https://gerrit.wikimedia.org/r/226097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1ae541b99e87f17efba517065a88deb70509b37
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
