create $proxy_server variable in init.pp

This variable has the proxy server / port in the format expected by puppet/archive.
voxpupuli · Mar 3, 2016 · b525210 · b525210
1 parent f7691ef
commit b525210
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -276,8 +276,14 @@
       require => Package['jenkins'],
       notify  => Service['jenkins']
     }
+
+    # param format needed by puppet/archive
+    $proxy_server = "http://${jenkins::proxy_host}:${jenkins::proxy_port}"
+  } else {
+    $proxy_server = undef
   }
 
+
   include jenkins::service
 
   if defined('::firewall') {

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -95,14 +95,6 @@
   }
 
   if (empty(grep($installed_plugins, $search))) {
-    if ($jenkins::proxy_host) {
-      # archive expects protocol in proxy_server, but jenkins proxy.xml expects no protocol
-      # assume http
-      $proxy_server = "http://${jenkins::proxy_host}:${jenkins::proxy_port}"
-    } else {
-      $proxy_server = undef
-    }
-
     $enabled_ensure = $enabled ? {
       false   => present,
       default => absent,