projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Revert "ssh_upload -> hiera role""
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
f1e24a7
..
83ddc6c
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-34,9
+34,6
@@
class roles {
include roles::dakmaster
include roles::signing
}
include roles::dakmaster
include roles::signing
}
- if has_role('ssh.upload.d.o') {
- include roles::ssh_upload
- }
if has_role('security_upload') {
include roles::security_upload
}
if has_role('security_upload') {
include roles::security_upload
}