X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fstatic_base.pp;h=e062a9e5191425891bc86ef57dda1c0ad139d07a;hb=5ceee98c7f384f16e7a31474214515347e3bd187;hp=267c8ba61f64e47550df972dad06642e369c066b;hpb=7c585ebe7158441bac0b23c73b3727437d06e9a1;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/static_base.pp b/modules/roles/manifests/static_base.pp index 267c8ba61..e062a9e51 100644 --- a/modules/roles/manifests/static_base.pp +++ b/modules/roles/manifests/static_base.pp @@ -1,17 +1,12 @@ class roles::static_base { - if ! $::staticsync_key { - exec { 'create-staticsync-key': - command => '/bin/su - staticsync -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'', - onlyif => '/usr/bin/getent passwd staticsync > /dev/null && ! [ -e /home/staticsync/.ssh/id_rsa ]' - } - } + if ! $::staticsync_key { + exec { 'create-staticsync-key': + command => '/bin/su - staticsync -c \'mkdir -p -m 02700 .ssh && ssh-keygen -C "`whoami`@`hostname` (`date +%Y-%m-%d`)" -P "" -f .ssh/id_rsa -q\'', + onlyif => '/usr/bin/getent passwd staticsync > /dev/null && ! [ -e /home/staticsync/.ssh/id_rsa ]' + } + } - file { - '/etc/static-components.conf': - source => "puppet:///modules/roles/static-mirroring/static-components.conf", - ; - } + file { '/etc/static-components.conf': + source => 'puppet:///modules/roles/static-mirroring/static-components.conf', + } } -# vim:set et: -# vim:set sts=4 ts=4: -# vim:set shiftwidth=4: