summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Dittberner <jandd@cacert.org>2018-03-27 20:08:58 +0200
committerJan Dittberner <jandd@cacert.org>2018-03-27 20:08:58 +0200
commit723c90dbbc1fcae1491dbb9002d79cb2bd8d85a9 (patch)
treec449e7051288f5527482fc0e277fe2e2c034fa3f
parentd221c391a4ba4537bf4fddf765606bd475667f49 (diff)
downloadcacert-puppet-723c90dbbc1fcae1491dbb9002d79cb2bd8d85a9.tar.gz
cacert-puppet-723c90dbbc1fcae1491dbb9002d79cb2bd8d85a9.tar.xz
cacert-puppet-723c90dbbc1fcae1491dbb9002d79cb2bd8d85a9.zip
Use DNS resolver on infra02 to resolve local names
- make sure zsh is installed before users are given zsh as their login shell - setup resolv.conf - use name instead of IP address for proxyout
-rw-r--r--sitemodules/profiles/files/base/apt_proxy.conf2
-rw-r--r--sitemodules/profiles/files/base/resolv.conf2
-rw-r--r--sitemodules/profiles/manifests/base.pp13
3 files changed, 15 insertions, 2 deletions
diff --git a/sitemodules/profiles/files/base/apt_proxy.conf b/sitemodules/profiles/files/base/apt_proxy.conf
index 5dab694..7bf71b6 100644
--- a/sitemodules/profiles/files/base/apt_proxy.conf
+++ b/sitemodules/profiles/files/base/apt_proxy.conf
@@ -1,3 +1,3 @@
-Acquire::http { Proxy "http://10.0.0.201:3128"; };
+Acquire::http { Proxy "http://proxyout:3128"; };
Acquire::PDiffs False;
Acquire::Languages "none";
diff --git a/sitemodules/profiles/files/base/resolv.conf b/sitemodules/profiles/files/base/resolv.conf
new file mode 100644
index 0000000..3957cd3
--- /dev/null
+++ b/sitemodules/profiles/files/base/resolv.conf
@@ -0,0 +1,2 @@
+search infra.cacert.org intra.cacert.org
+nameserver 10.0.0.1
diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp
index 9caf8cf..0c7ecf6 100644
--- a/sitemodules/profiles/manifests/base.pp
+++ b/sitemodules/profiles/manifests/base.pp
@@ -100,6 +100,9 @@ class profiles::base (
package { ['zsh', 'tmux', 'less']:
ensure => latest,
}
+
+ Package["zsh"] -> User <| |>
+
package { ['aptitude', 'apticron']:
ensure => purged,
}
@@ -148,8 +151,16 @@ class profiles::base (
file { '/etc/apt/preferences.d/blacklist_systemd-sysv.pref':
ensure => file,
owner => 'root',
- group =>'root',
+ group => 'root',
mode => '0644',
source => 'puppet:///modules/profiles/base/apt_blacklist_systemd-sysv.pref',
}
+
+ file { '/etc/resolv.conf':
+ ensure => file,
+ owner => 'root',
+ group => 'root',
+ mode => '0644',
+ source => 'puppet:///modules/profiles/base/resolv.conf',
+ }
}