Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Export prettyname for use in dashboard proxies.

  • Loading branch information...
commit 7f751d895d811eaa3b8b7404b14a043757696213 1 parent 9945578
Rutger Spiertz authored
8 kbp_base/manifests/init.pp
View
@@ -172,9 +172,13 @@
include kbp_icinga::environment
include kbp_user::environment
- @@kbp_dashboard::environment { $environment:; }
+ @@kbp_dashboard::environment { $environment:
+ prettyname => $sanitized_customer_name;
+ }
- @@kbp_dashboard_new::environment { $environment:; }
+ @@kbp_dashboard_new::environment { $environment:
+ prettyname => $sanitized_customer_name;
+ }
@@kbp_smokeping::environment { $environment:; }
2  kbp_dashboard/manifests/init.pp
View
@@ -45,7 +45,7 @@
}
}
-define kbp_dashboard::environment($url, $port) {
+define kbp_dashboard::environment($url, $port, $prettyname) {
kbp_apache::vhost_addition { "${url}/proxies_${name}":
ports => $port,
content => template('kbp_dashboard/vhost-additions/proxies');
4 kbp_dashboard/templates/vhost-additions/proxies
View
@@ -11,8 +11,8 @@ ProxyPassMatch ^(/images/.*)$ https://icinga.kumina.nl$1
ProxyPassReverse /images/ https://icinga.kumina.nl
# Munin
-ProxyPass /<%= name %>/munin https://munin.kumina.nl/<%= name %>
-ProxyPassReverse /<%= name %>/munin https://munin.kumina.nl/<%= name %>
+ProxyPass /<%= name %>/munin https://munin.kumina.nl/<%= prettyname %>
+ProxyPassReverse /<%= name %>/munin https://munin.kumina.nl/<%= prettyname %>
# Smokeping
ProxyPass /<%= name %>/smokeping https://smokeping.kumina.nl/<%= name %>
2  kbp_dashboard_new/manifests/init.pp
View
@@ -41,7 +41,7 @@
}
}
-define kbp_dashboard_new::environment($url, $prod_url, $port) {
+define kbp_dashboard_new::environment($url, $prod_url, $port, $prettyname) {
kbp_apache::vhost_addition { "${url}/proxies_${name}":
ports => $port,
content => template('kbp_dashboard_new/vhost-additions/proxies');
4 kbp_dashboard_new/templates/vhost-additions/proxies
View
@@ -11,8 +11,8 @@ ProxyPassMatch ^(/images/.*)$ https://icinga.kumina.nl$1
ProxyPassReverse /images/ https://icinga.kumina.nl
# Munin
-ProxyPass /<%= name %>/munin https://munin.kumina.nl/<%= name %>
-ProxyPassReverse /<%= name %>/munin https://munin.kumina.nl/<%= name %>
+ProxyPass /<%= name %>/munin https://munin.kumina.nl/<%= prettyname %>
+ProxyPassReverse /<%= name %>/munin https://munin.kumina.nl/<%= prettyname %>
# Smokeping
ProxyPass /<%= name %>/smokeping https://smokeping.kumina.nl/<%= name %>
Please sign in to comment.
Something went wrong with that request. Please try again.