Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/198118
to review the following change.
Change subject: Allow limn instances to specify Apache config for proxy
......................................................................
Allow limn instances to specify Apache config for proxy
Change-Id: Ic17f69e406746a9b2110f5d1c37a5cd65560b504
---
M manifests/misc/limn.pp
M modules/limn/manifests/instance/proxy.pp
2 files changed, 19 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/198118/1
diff --git a/manifests/misc/limn.pp b/manifests/misc/limn.pp
index 7d8ba27..b0f9e84 100644
--- a/manifests/misc/limn.pp
+++ b/manifests/misc/limn.pp
@@ -5,23 +5,25 @@
# default $server_name and $server_aliases.
#
# == Parameters:
-# $port - limn port
-# $server_name - ServerName for limn instance proxy. Default it to
infer from $name and $::realm.
-# $server_aliases - ServerAliases for limn instance proxy. Default is to
infer from $name and $::realm.
-# $environment - Node environment. Default: production
-# $base_directory - Limn install base directory. Default:
/usr/local/share/limn
-# $var_directory - Limn instance var directory. Limn datafiles live here.
Default: /var/lib/limn/$name
+# $port - limn port
+# $server_name - ServerName for limn instance proxy. Default it to
infer from $name and $::realm.
+# $server_aliases - ServerAliases for limn instance proxy. Default is to
infer from $name and $::realm.
+# $environment - Node environment. Default: production
+# $base_directory - Limn install base directory. Default:
/usr/local/share/limn
+# $var_directory - Limn instance var directory. Limn datafiles live
here. Default: /var/lib/limn/$name
+# $proxy_site_template - Template for proxy Apache conf Default:
limn/vhost-limn-proxy.conf.erb.
#
# == Example
# misc::limn::instance { 'reportcard': }
#
define misc::limn::instance(
- $port = 8081,
- $environment = 'production',
- $base_directory = '/usr/local/share/limn',
- $var_directory = "/var/lib/limn/${name}",
- $server_name = undef,
- $server_aliases = undef)
+ $port = 8081,
+ $environment = 'production',
+ $base_directory = '/usr/local/share/limn',
+ $var_directory = "/var/lib/limn/${name}",
+ $server_name = undef,
+ $server_aliases = undef,
+ $proxy_site_template = 'limn/vhost-limn-proxy.conf.erb')
{
::limn::instance { $name:
port => $port,
@@ -59,5 +61,6 @@
server_name => $servername,
server_aliases => $serveraliases,
require => ::Limn::Instance[$name],
+ site_template => $proxy_site_template,
}
}
diff --git a/modules/limn/manifests/instance/proxy.pp
b/modules/limn/manifests/instance/proxy.pp
index 5332846..0e89c78 100644
--- a/modules/limn/manifests/instance/proxy.pp
+++ b/modules/limn/manifests/instance/proxy.pp
@@ -14,6 +14,7 @@
# $document_root - Path to Apache document root. This should be the
limn::instance $var_directory. Default: /usr/local/share/limn/var.
# $server_name - Named VirtualHost. Default: "$name.$domain"
# $server_aliases - Server name aliases. Default: none.
+# $site_template - Template for Apache conf. Default:
limn/vhost-limn-proxy.conf.erb.
#
define limn::instance::proxy (
$port = 80,
@@ -21,13 +22,14 @@
$limn_port = '8081',
$document_root = '/usr/local/share/limn/var',
$server_name = "${name}.${::domain}",
- $server_aliases = '')
+ $server_aliases = '',
+ $site_template = 'limn/vhost-limn-proxy.conf.erb')
{
# Configure the Apache Limn instance proxy VirtualHost.
$priority = 10
file { "${priority}-limn-${name}.conf":
path => "/etc/apache2/sites-enabled/${priority}-limn-${name}.conf",
- content => template('limn/vhost-limn-proxy.conf.erb'),
+ content => template($site_template),
owner => 'root',
group => 'root',
mode => '0444',
--
To view, visit https://gerrit.wikimedia.org/r/198118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic17f69e406746a9b2110f5d1c37a5cd65560b504
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
