[MediaWiki-commits] [Gerrit] Remove obsolete code that manages phabricator src/extensions - change (operations/puppet)

2016-06-25 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: Remove obsolete code that manages phabricator src/extensions
..


Remove obsolete code that manages phabricator src/extensions

We now use phutil libraries loaded from libext/extension/* via configuration.
Get rid of unneeded code for injecting extensions into the phabricator src tree.

Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
---
D modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/phabricator/labs.pp
M modules/role/manifests/phabricator/main.pp
4 files changed, 0 insertions(+), 35 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/phabricator/manifests/extension.pp 
b/modules/phabricator/manifests/extension.pp
deleted file mode 100644
index 2b143b7..000
--- a/modules/phabricator/manifests/extension.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: phabricator::extension
-#
-# === Parameters
-#
-# [*rootdir*]
-#Phabricator repo directory
-
-define phabricator::extension($rootdir='/') {
-file { "${rootdir}/phabricator/src/extensions/${name}":
-ensure  => 'link',
-target  => "${rootdir}/extensions/${name}",
-require => File[$rootdir],
-}
-}
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index ae712f6..6eafb2d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -26,8 +26,6 @@
 # maintenance
 # Requires: mysql_admin_user
 #
-# [*extensions*]
-# Array of extensions to load
 #
 # [*serveralias*]
 # Alternative domain on which to respond too
@@ -55,7 +53,6 @@
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
-$extensions   = [],
 $settings = {},
 $mysql_admin_user = '',
 $mysql_admin_pass = '',
@@ -165,22 +162,6 @@
 require => $base_requirements,
 }
 $phab_settings['load-libraries'] = $libraries
-}
-
-if ($extensions) {
-file { "${phabdir}/phabricator/src/extensions":
-ensure  => 'directory',
-path=> "${phabdir}/phabricator/src/extensions",
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-require => $base_requirements,
-}
-
-phabricator::extension { $extensions:
-rootdir => $phabdir,
-require => $base_requirements,
-}
 }
 
 file { '/etc/php5/apache2/php.ini':
diff --git a/modules/role/manifests/phabricator/labs.pp 
b/modules/role/manifests/phabricator/labs.pp
index 4f590b6..48d2593 100644
--- a/modules/role/manifests/phabricator/labs.pp
+++ b/modules/role/manifests/phabricator/labs.pp
@@ -11,7 +11,6 @@
 libraries => ["${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/"],
-extensions=> [ ],
 settings  => {
 'darkconsole.enabled' => true,
 'phabricator.base-uri'=> 
"https://${::hostname}.wmflabs.org;,
diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 3cf11ba..1bccc2d 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -37,7 +37,6 @@
 libraries=> [ "${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/" ],
-extensions   => [ ],
 settings => {
 'darkconsole.enabled'=> false,
 'phabricator.base-uri'   => "https://${domain};,

-- 
To view, visit https://gerrit.wikimedia.org/r/296068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Remove obsolete code that manages phabricator src/extensions - change (operations/puppet)

2016-06-25 Thread 20after4 (Code Review) 
20after4 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296068

Change subject: Remove obsolete code that manages phabricator src/extensions
..

Remove obsolete code that manages phabricator src/extensions

We now use phutil libraries loaded from libext/extension/* via configuration.
Get rid of unneeded code for injecting extensions into the phabricator src tree.

Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
---
D modules/phabricator/manifests/extension.pp
M modules/phabricator/manifests/init.pp
M modules/role/manifests/phabricator/labs.pp
M modules/role/manifests/phabricator/main.pp
4 files changed, 0 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/68/296068/1

diff --git a/modules/phabricator/manifests/extension.pp 
b/modules/phabricator/manifests/extension.pp
deleted file mode 100644
index 2b143b7..000
--- a/modules/phabricator/manifests/extension.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-# == Class: phabricator::extension
-#
-# === Parameters
-#
-# [*rootdir*]
-#Phabricator repo directory
-
-define phabricator::extension($rootdir='/') {
-file { "${rootdir}/phabricator/src/extensions/${name}":
-ensure  => 'link',
-target  => "${rootdir}/extensions/${name}",
-require => File[$rootdir],
-}
-}
diff --git a/modules/phabricator/manifests/init.pp 
b/modules/phabricator/manifests/init.pp
index ae712f6..6eafb2d 100644
--- a/modules/phabricator/manifests/init.pp
+++ b/modules/phabricator/manifests/init.pp
@@ -26,8 +26,6 @@
 # maintenance
 # Requires: mysql_admin_user
 #
-# [*extensions*]
-# Array of extensions to load
 #
 # [*serveralias*]
 # Alternative domain on which to respond too
@@ -55,7 +53,6 @@
 $timezone = 'UTC',
 $trusted_proxies  = [],
 $libraries= [],
-$extensions   = [],
 $settings = {},
 $mysql_admin_user = '',
 $mysql_admin_pass = '',
@@ -165,22 +162,6 @@
 require => $base_requirements,
 }
 $phab_settings['load-libraries'] = $libraries
-}
-
-if ($extensions) {
-file { "${phabdir}/phabricator/src/extensions":
-ensure  => 'directory',
-path=> "${phabdir}/phabricator/src/extensions",
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-require => $base_requirements,
-}
-
-phabricator::extension { $extensions:
-rootdir => $phabdir,
-require => $base_requirements,
-}
 }
 
 file { '/etc/php5/apache2/php.ini':
diff --git a/modules/role/manifests/phabricator/labs.pp 
b/modules/role/manifests/phabricator/labs.pp
index 4f590b6..48d2593 100644
--- a/modules/role/manifests/phabricator/labs.pp
+++ b/modules/role/manifests/phabricator/labs.pp
@@ -11,7 +11,6 @@
 libraries => ["${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/"],
-extensions=> [ ],
 settings  => {
 'darkconsole.enabled' => true,
 'phabricator.base-uri'=> 
"https://${::hostname}.wmflabs.org;,
diff --git a/modules/role/manifests/phabricator/main.pp 
b/modules/role/manifests/phabricator/main.pp
index 3cf11ba..1bccc2d 100644
--- a/modules/role/manifests/phabricator/main.pp
+++ b/modules/role/manifests/phabricator/main.pp
@@ -37,7 +37,6 @@
 libraries=> [ "${phab_root_dir}/libext/Sprint/src",
   "${phab_root_dir}/libext/security/src",
   "${phab_root_dir}/libext/misc/" ],
-extensions   => [ ],
 settings => {
 'darkconsole.enabled'=> false,
 'phabricator.base-uri'   => "https://${domain};,

-- 
To view, visit https://gerrit.wikimedia.org/r/296068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I86bf5b7a4f07c473a4c401efe4394fe8a71ef1c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits