diff options
| author | Leif Johansson <leifj@sunet.se> | 2014-03-03 15:59:01 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2014-03-03 15:59:01 +0100 |
| commit | 09f4f5ce5c3394bfa3cd24b068399776490b91db (patch) | |
| tree | 214454dc59f9535e973a659c646e6603b0b09c5f /global | |
| parent | 8652b0a1c50eecdd97b2e23e104b1b95285a6795 (diff) | |
Diffstat (limited to 'global')
| -rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 4 | ||||
| -rwxr-xr-x | global/pre-tasks.d/020common-tools | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index 0cceb20..c5e1f3f 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -312,10 +312,10 @@ class sunet { fixperms_paranoia => true, } } - } node 'samltest.swamid.se' { + ssh_authorized_key {'hans-its-umu': name => 'haho0032@its-admins-MacBook-Pro.local', ensure => present, @@ -329,7 +329,7 @@ node 'samltest.swamid.se' { class sunet-cdr { class { 'dhcp': - dnsdomain => [ 'eduid.se','sunet.se' ], + dnsdomain => [ 'eduid.se','sunet.se','swamid.se' ], nameservers => ['130.242.80.14','130.242.80.99'], ntpservers => ['ntp1.nordu.net','ntp2.nordu.net','Time1.Stupi.SE'], interfaces => ['bond0'], diff --git a/global/pre-tasks.d/020common-tools b/global/pre-tasks.d/020common-tools index eaca6ea..eef7654 100755 --- a/global/pre-tasks.d/020common-tools +++ b/global/pre-tasks.d/020common-tools @@ -5,10 +5,10 @@ set -e -stamp="$COSMOS_BASE/stamps/common-tools-v01.stamp" +stamp="$COSMOS_BASE/stamps/common-tools-v02.stamp" if ! test -f $stamp; then - apt-get -y install vim traceroute tcpdump molly-guard less rsync git-core unattended-upgrades ntp + apt-get -y install vim traceroute tcpdump molly-guard less rsync git-core unattended-upgrades ntp wget update-alternatives --set editor /usr/bin/vim.basic mkdir -p `dirname $stamp` |