Managing apt-cacher-ng at nodo::role::proxy

diff --git a/manifests/role/proxy.pp b/manifests/role/proxy.pp
index c298f962411d8c2d0460bb5708e871b8fb62cbf1..bd0e825ac326af9faa306df326877dfb8963774c 100644 (file)
--- a/manifests/role/proxy.pp
+++ b/manifests/role/proxy.pp
@@ -11,4 +11,13 @@ class nodo::role::proxy inherits nodo::base::vserver {
   package { 'liblwp-useragent-determined-perl':
     ensure => installed,
   }
+
+  # Apt cacher
+  package { 'apt-cacher-ng':
+    ensure => present,
+  }
+
+  class { 'apt::proxy_client':
+    require => Package['apt-cacher-ng'],
+  }
 }

diff --git a/manifests/subsystem/apt.pp b/manifests/subsystem/apt.pp
index 910565776f69e96253b69c27d8ac2182e3239b5d..3bb60a409e3dbb83328cdfd0648c81904111a0bb 100644 (file)
--- a/manifests/subsystem/apt.pp
+++ b/manifests/subsystem/apt.pp
@@ -38,7 +38,7 @@ class nodo::subsystem::apt {
   if $apt_proxy != false {
     class { 'apt::proxy_client':
       proxy => $apt_proxy,
-      port  => hiera('nodo::subsystem::apt::proxy_port', ''),
+      port  => hiera('nodo::subsystem::apt::proxy_port', '3142'),
     }
   }