diff options
| author | Jan Dittberner <jandd@cacert.org> | 2017-08-26 18:03:33 +0200 |
|---|---|---|
| committer | Jan Dittberner <jandd@cacert.org> | 2017-08-26 18:03:33 +0200 |
| commit | bc40d81b5062665142744a78069528308fbe7bbf (patch) | |
| tree | 78bf7a075a4eb9c9ac66466096db07b1025709ac | |
| parent | 4e2a3bbc4a160ae0596c7c7d46410368738cfeaf (diff) | |
| download | cacert-puppet-bc40d81b5062665142744a78069528308fbe7bbf.tar.gz cacert-puppet-bc40d81b5062665142744a78069528308fbe7bbf.tar.xz cacert-puppet-bc40d81b5062665142744a78069528308fbe7bbf.zip | |
Manage apt proxy configuration
| -rw-r--r-- | sitemodules/profiles/files/base/apt_proxy.conf | 3 | ||||
| -rw-r--r-- | sitemodules/profiles/manifests/base.pp | 24 |
2 files changed, 19 insertions, 8 deletions
diff --git a/sitemodules/profiles/files/base/apt_proxy.conf b/sitemodules/profiles/files/base/apt_proxy.conf new file mode 100644 index 0000000..5dab694 --- /dev/null +++ b/sitemodules/profiles/files/base/apt_proxy.conf @@ -0,0 +1,3 @@ +Acquire::http { Proxy "http://10.0.0.201:3128"; }; +Acquire::PDiffs False; +Acquire::Languages "none"; diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp index f29a393..86daddb 100644 --- a/sitemodules/profiles/manifests/base.pp +++ b/sitemodules/profiles/manifests/base.pp @@ -54,14 +54,14 @@ class profiles::base ( managehome => true, } $user['ssh_keys'].each |Hash[String, Data] $keydata| { - $keyname = $keydata['name'] - ssh_authorized_key { "${osusername}@${keyname}": - ensure => present, - user => $user['username'], - type => $keydata['type'], - key => $keydata['key'], - require => User[$osusername], - } + $keyname = $keydata['name'] + ssh_authorized_key { "${osusername}@${keyname}": + ensure => present, + user => $user['username'], + type => $keydata['type'], + key => $keydata['key'], + require => User[$osusername], + } } } @@ -72,4 +72,12 @@ class profiles::base ( mode => '0755', source => 'puppet:///modules/profiles/puppet.init', } + + file { '/etc/apt/apt.conf.d/03proxy': + ensure => file, + owner => 'root', + group => 'root', + mode => '0644', + source => 'puppet:///modules/profiles/base/apt_proxy.conf', + } } |