Use DNS resolver on infra02 to resolve local names
authorJan Dittberner <jandd@cacert.org>
Tue, 27 Mar 2018 18:08:58 +0000 (20:08 +0200)
committerJan Dittberner <jandd@cacert.org>
Tue, 27 Mar 2018 18:08:58 +0000 (20:08 +0200)
- 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

sitemodules/profiles/files/base/apt_proxy.conf
sitemodules/profiles/files/base/resolv.conf [new file with mode: 0644]
sitemodules/profiles/manifests/base.pp

index 5dab694..7bf71b6 100644 (file)
@@ -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 (file)
index 0000000..3957cd3
--- /dev/null
@@ -0,0 +1,2 @@
+search infra.cacert.org intra.cacert.org
+nameserver 10.0.0.1
index 9caf8cf..0c7ecf6 100644 (file)
@@ -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',
+  }
 }