This commit is contained in:
Leif Johansson 2018-02-23 15:04:46 +01:00
parent 0089a01e2c
commit 483584d346

View file

@ -145,7 +145,7 @@ class md_signer($dest_host="localhost",$dest_dir="") {
username => 'root',
group => 'root',
manage_user => false,
ssh_privkey => safe_hiera("publisher_ssh_privkey","NOT SET IN HIERA")
ssh_privkey => safe_hiera("publisher_ssh_privkey")
} ->
sunet::scriptherder::cronjob { "${name}-publish":
cmd => "env RSYNC_ARGS='--chown=www-data:www-data --chmod=D0755,F0664' /usr/local/bin/mirror-mdq.sh http://localhost root@${dest_host}:${dest_dir}",
@ -164,8 +164,8 @@ class md_publisher(Array $allow_clients=['any'], $keyname=undef, String $dir="/v
file { '/var/www/html': ensure => directory, mode => '0755', owner => 'www-data', group =>'www-data' } ->
sunet::rrsync {$dir:
ro => false,
ssh_key => safe_hiera('publisher_ssh_key',"NOT SET IN HIERA"),
ssh_key_type => safe_hiera('publisher_ssh_key_type',"HOT SET IN HIERA")
ssh_key => safe_hiera('publisher_ssh_key'),
ssh_key_type => safe_hiera('publisher_ssh_key_type')
} ->
package {'lighttpd': ensure => latest } ->
exec {'enable-ssl':