summaryrefslogtreecommitdiff
path: root/global
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-09-23 10:14:37 +0200
committerLeif Johansson <leifj@sunet.se>2015-09-23 10:14:37 +0200
commit2f85af1de3f540e1cc930bca448374dda294dfb8 (patch)
treef015fdc511c76de2ad4390cb5ccc25501c4a29bb /global
parent104890bf560783e7df69e1f8170fe43a56666360 (diff)
fredriks nya nyckelsunet-ops-2015-09-23-v01
Diffstat (limited to 'global')
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp9
1 files changed, 8 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index d63561f..5282e40 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -735,6 +735,13 @@ class swamidops {
user => 'root',
name => 'fredrik.aslund@umu.se-yubikey-neo'
}
+ ssh_authorized_key {'aslund-umu':
+ type => 'ssh-rsa',
+ key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCEZrzlhpmsmgK9zQjCmaU7IhNFfxeQuNsR1ONA78KD/Mey1XiS09/UEsymVJiFHq45X5pG2Ano8oPYiJb6vpKbwF+/B55R1g/atqbrU+s8XPAYJoswGAJFG1FnWRjXqEd/GoricHMCIE0+AbqTkaFwYP/+B0tiY6jVWdAN0hBmStZDM97S/mcmAmqmuUauIQcF2m/0NfaBm+ou07beP6uSosufYs2NQDWCWSkIgS6y7OD+EAo9Wyo4HZigWAX6ASMX7CR6YHSN8BcdzZJE4SEneuFR5bVwqYO/nB2oqYj5FpQhMNiBJyZVe1a+BvQ1qh2kUMkE28DIyeW+Fg0paajZ',
+ ensure => present,
+ user => 'root',
+ name => 'fredrik.aslund@umu.se-yubikey-neo-n'
+ }
}
node 'cdr1.sunet.se' {
@@ -879,7 +886,7 @@ node 'web-a1.sunet.se' {
sunet::wordpress {'www_sunet_se':
wordpress_image => 'docker.sunet.se/shib-wordpress',
wordpress_version => 'latest',
- sp_hostname => 'www2.sunet.se'
+ sp_hostname => 'www.test.sunet.se'
} ->
file { '/data/kalturabilling': ensure => directory } ->
sunet::docker_run {'kalturabilling':