diff options
| author | Micah Anderson <micah@leap.se> | 2013-12-18 13:10:46 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-12-18 13:10:46 -0500 |
| commit | 2308bc185d23638a20422dfd98c670fa143b32ff (patch) | |
| tree | 2eada0e7d010ea5904a18bc6a2553543f03e24aa /puppet/modules/site_config/manifests/default.pp | |
| parent | e8af63fedc1738c0afbb9cee2a2339719d62b38f (diff) | |
| parent | 88af29f3aba662aab4ca5ac3122d43139fb97004 (diff) | |
Merge branch 'feature/4506' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests/default.pp')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 33d3df05..d85d9c8f 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -12,7 +12,6 @@ class site_config::default { include site_config::slow - include concat::setup # default class, used by all hosts @@ -22,6 +21,9 @@ class site_config::default { # configure apt include site_apt + # configure sysctl parameters + include site_config::sysctl + # configure ssh and include ssh-keys include site_config::sshd |