diff options
author | Leif Johansson <leifj@sunet.se> | 2014-09-29 13:25:05 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2014-09-29 13:25:05 +0200 |
commit | c219b7e1b18083ee3d86e926689103dfed39a066 (patch) | |
tree | fe4523e7c9488d99a307c84ae9a9a7e096fe10c1 /global | |
parent | ac8408a9892c525f5e71e7d52ef0daf7a6020775 (diff) |
aslund new keysunet-ops-2014-09-29-v03sunet-ops-2014-09-29-v02
Diffstat (limited to 'global')
-rw-r--r-- | global/overlay/etc/puppet/manifests/cosmos-site.pp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp index da8fe74..59c029d 100644 --- a/global/overlay/etc/puppet/manifests/cosmos-site.pp +++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp @@ -80,7 +80,8 @@ node 'registry.swamid.se' { class {'pyff': load => ['/opt/peer/vf_repo'], validUntil => 'P10D', - cacheDuration => 'PT5H' + cacheDuration => 'PT5H', + replace => false } $peerpkg = ['xmlsec1','libxmlsec1-openssl','libpq-dev','postgresql','postgresql-client'] package { $peerpkg: ensure => installed } @@ -498,10 +499,10 @@ class swamidops { } ssh_authorized_key {'aslund-umu': type => 'ssh-rsa', - key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQC1fzNy2/nmIwyrHX2FJhjmkfc0BKqVMBKJoM+NyNI9T0tWe/Vmpa4xnRwZ/qBZgk1Gh2ttjY+PiT9Y1VXQLJ7YMNJezoD5xT3MmOlj5vQPP2d6ZC+pqADatBUpdnI65GQZfXSbiYVpc3b/WzieYKoGo8wk1JuXF1McEH5oXViUW96R4PuB+nXowSE1a7lmLXIiWov/qHa+5LwZQ8l8Xw46gh6AOtnvKJeUsgUvGMC/SnSBiZrfruyQCvNrzdjFQHKW79sWRPRBfU356583QmuqYprQ5gINA4zVbwfT1xaFYqsb+/IUX+Hcw5wlWdfTxhzvzelgg0qVVvRrqEhwMtgN', + key => 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCxFHI9HiyKFuZFjbsX9qcp9a5DEYu2C3uaroJdRLzt2HiqHDg8G3x63XLppzWOzmjT+vvIDvDTtiYJXXbNKU/0FCvfs0Z5/ujPh/GdUc8lTI7B1yVeHjk3hDATE1RqtIcHWEm7DM90fFxUxyTW0K2560wgTzZgZi1ElSJ/soiZv6eaO6k4X1AJzMzN/tHPzixWPnw0mU4sRMcmLPx32KwvUdmzEI3NglhXICbqEN4pxRFeQ7s19JvIZ7NVaS10D77l2YECsONViPHlN5fyYzvI58b8LotMHBmh3LEHn+M3wFMFKy1eVZ1qdMKmdmWcsnYmrSAGHH/JkLwJuh/uGs+Z', ensure => present, user => 'root', - name => 'fredrik.aslund@umu.se/epass2003/130409' + name => 'fredrik.aslund@umu.se-yubikey-neo' } } |