diff options
| author | Micah Anderson <micah@leap.se> | 2013-10-02 12:26:24 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2013-10-02 12:26:24 -0400 |
| commit | 05630d4640d295a8c42a916fea6bbae49f29bc77 (patch) | |
| tree | d8a9714881efdae9b6af43e26fc441b89e6e01e9 /puppet/modules | |
| parent | 81fe380535c731c7afc134fb4e62b6232f690375 (diff) | |
| parent | 62271e0e067daef064dba2860a92eb6351510d3c (diff) | |
Merge branch 'feature/3955' into develop
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/site_config/manifests/default.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/packages/base_packages.pp (renamed from puppet/modules/site_config/manifests/base_packages.pp) | 2 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/packages/gnutls.pp | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/default.pp b/puppet/modules/site_config/manifests/default.pp index 16932ab2..d3bb241f 100644 --- a/puppet/modules/site_config/manifests/default.pp +++ b/puppet/modules/site_config/manifests/default.pp @@ -48,7 +48,7 @@ class site_config::default { } # install/remove base packages - include site_config::base_packages + include site_config::packages::base # include basic shorewall config include site_shorewall::defaults diff --git a/puppet/modules/site_config/manifests/base_packages.pp b/puppet/modules/site_config/manifests/packages/base_packages.pp index 3d40f7a2..d93e194b 100644 --- a/puppet/modules/site_config/manifests/base_packages.pp +++ b/puppet/modules/site_config/manifests/packages/base_packages.pp @@ -1,4 +1,4 @@ -class site_config::base_packages { +class site_config::packages::base { # base set of packages that we want to have installed everywhere package { [ 'etckeeper', 'screen', 'less' ]: diff --git a/puppet/modules/site_config/manifests/packages/gnutls.pp b/puppet/modules/site_config/manifests/packages/gnutls.pp new file mode 100644 index 00000000..b1f17480 --- /dev/null +++ b/puppet/modules/site_config/manifests/packages/gnutls.pp @@ -0,0 +1,5 @@ +class site_config::packages::gnutls { + + package { 'gnutls-bin': ensure => installed } + +} |