projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
long options are king
[mirror/dsa-puppet.git]
/
modules
/
staticsync
/
manifests
/
static_master.pp
diff --git
a/modules/staticsync/manifests/static_master.pp
b/modules/staticsync/manifests/static_master.pp
index
17efe76
..
716b12c
100644
(file)
--- a/
modules/staticsync/manifests/static_master.pp
+++ b/
modules/staticsync/manifests/static_master.pp
@@
-22,16
+22,13
@@
class staticsync::static_master (
source => 'puppet:///modules/staticsync/static-master-update-component',
mode => '0555',
}
source => 'puppet:///modules/staticsync/static-master-update-component',
mode => '0555',
}
- file { '/etc/static-clients.conf':
- content => template('staticsync/static-clients.conf.erb'),
+ concat { '/etc/static-clients.conf':
+ ensure_newline => true,
+ warn => @(EOF),
+ ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+ | EOF
}
}
-# concat { '/etc/static-clients.conf':
-# ensure_newline => true,
-# warn => @(EOF),
-# ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-# | EOF
-# }
-# Concat::Fragment <<| tag == 'staticsync::static-mirrors-to-trigger' |>>
+ Concat::Fragment <<| tag == 'staticsync::static-mirrors-to-trigger' |>>
file { "/home/${staticsync::user}/static-master":
ensure => link,
file { "/home/${staticsync::user}/static-master":
ensure => link,