[MediaWiki-commits] [Gerrit] aptrepo: make conf/incoming configurable parameter - change (operations/puppet)

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

Change subject: aptrepo: make conf/incoming configurable parameter
..


aptrepo: make conf/incoming configurable parameter

Because we have 2 use cases for aptrepo, carbon (apt.wm) and bromine
(releases.wm) with different config for incoming uploads, we need
to make this configurable.

Adds a parameter incomingconf to set to a template name
that will have the content of ./reprepro/conf/incoming.

Bug:T132757
Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
---
M modules/aptrepo/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 6aa0865..1ac50b3 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -12,6 +12,7 @@
 #   - *options*: A list of options for reprepro (see conf/options file).
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
+#   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -34,6 +35,7 @@
 $options = [],
 $uploaders   = [],
 $incomingdir = 'incoming',
+$incomingconf= 'incoming',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -103,7 +105,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('aptrepo/incoming.erb'),
+content => template("aptrepo/${incomingconf}.erb"),
 }
 
 file { "${basedir}/conf/log":

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
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] aptrepo: make conf/incoming configurable parameter - change (operations/puppet)

2016-06-03 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review.

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

Change subject: aptrepo: make conf/incoming configurable parameter
..

aptrepo: make conf/incoming configurable parameter

Because we have 2 use cases for aptrepo, carbon (apt.wm) and bromine
(releases.wm) with different config for incoming uploads, we need
to make this configurable.

Adds a parameter incomingconf to set to a template name
that will have the content of ./reprepro/conf/incoming.

Bug:T132757
Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
---
M modules/aptrepo/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/292765/1

diff --git a/modules/aptrepo/manifests/init.pp 
b/modules/aptrepo/manifests/init.pp
index 6aa0865..1ac50b3 100644
--- a/modules/aptrepo/manifests/init.pp
+++ b/modules/aptrepo/manifests/init.pp
@@ -12,6 +12,7 @@
 #   - *options*: A list of options for reprepro (see conf/options file).
 #   - *uploaders*: A list of uploaders instructions (see "uploaders file")
 #   - *incomingdir*: Path considered for incoming uploads.
+#   - *incomingconf*: Name of a template with config options for incoming 
uploads. (conf/incoming)
 #   - *default_distro*: The default distribution if none specified.
 #   - *gpg_secring*: The GPG secret keyring for reprepro to use.
 #   - *gpg_pubring*: The GPG public keyring for reprepro to use.
@@ -34,6 +35,7 @@
 $options = [],
 $uploaders   = [],
 $incomingdir = 'incoming',
+$incomingconf= 'incoming',
 $default_distro  = 'jessie',
 $gpg_secring = undef,
 $gpg_pubring = undef,
@@ -103,7 +105,7 @@
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('aptrepo/incoming.erb'),
+content => template("aptrepo/${incomingconf}.erb"),
 }
 
 file { "${basedir}/conf/log":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibaf755e1e92f8cf3907665ea86bf054bc96d0da1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

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