Rush has submitted this change and it was merged.
Change subject: Revert "Ensure that phabricator/src/extensions exists"
......................................................................
Revert "Ensure that phabricator/src/extensions exists"
This reverts commit 4242b2fa038af7454c8f99a213c07158b0c3dcf8.
Error: Failed to apply catalog: Parameter require failed on
File[/srv/phab/phabricator/src/extensions/MediaWikiUserpageCustomField.php]:
No title provided and "/srv/phab/phabricator/src/extensions/"
is not a valid resource reference at
/etc/puppet/modules/phabricator/manifests/extension.pp:13
Wrapped exception:
No title provided and "/srv/phab/phabricator/src/extensions/" is not a valid
resource reference
Change-Id: Iafe9d8039161c8ab2d62f9f7023a5c6443701fbe
---
M modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
2 files changed, 0 insertions(+), 10 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/phabricator/manifests/extension.pp
b/modules/phabricator/manifests/extension.pp
index a368f3f..05387110 100644
--- a/modules/phabricator/manifests/extension.pp
+++ b/modules/phabricator/manifests/extension.pp
@@ -9,6 +9,5 @@
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 6abfff1..658b635 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -222,15 +222,6 @@
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/226090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafe9d8039161c8ab2d62f9f7023a5c6443701fbe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <r...@wikimedia.org>
Gerrit-Reviewer: Rush <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
