diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/base_installation/manifests/init.pp | 2 | ||||
-rw-r--r-- | modules/base_installation/manifests/params.pp | 1 | ||||
-rw-r--r-- | modules/profile/manifests/fstab.pp (renamed from modules/base_installation/manifests/fstab.pp) | 6 | ||||
-rw-r--r-- | modules/role/manifests/backup.pp | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/modules/base_installation/manifests/init.pp b/modules/base_installation/manifests/init.pp index cb1cdda..998f8ff 100644 --- a/modules/base_installation/manifests/init.pp +++ b/modules/base_installation/manifests/init.pp | |||
@@ -6,7 +6,6 @@ class base_installation ( | |||
6 | Optional[String] $ldap_dn = $base_installation::params::ldap_dn, | 6 | Optional[String] $ldap_dn = $base_installation::params::ldap_dn, |
7 | Optional[String] $ldap_server = $base_installation::params::ldap_server, | 7 | Optional[String] $ldap_server = $base_installation::params::ldap_server, |
8 | Optional[String] $ldap_uri = $base_installation::params::ldap_uri, | 8 | Optional[String] $ldap_uri = $base_installation::params::ldap_uri, |
9 | Optional[Array[String]] $mounts = $base_installation::params::mounts, | ||
10 | Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path, | 9 | Optional[String] $puppet_code_path = $base_installation::params::puppet_code_path, |
11 | Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path, | 10 | Optional[String] $puppet_conf_path = $base_installation::params::puppet_conf_path, |
12 | Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed, | 11 | Optional[String] $puppet_pass_seed = $base_installation::params::puppet_pass_seed, |
@@ -31,5 +30,4 @@ class base_installation ( | |||
31 | contain ::base_installation::users | 30 | contain ::base_installation::users |
32 | contain ::base_installation::package_managers | 31 | contain ::base_installation::package_managers |
33 | contain ::base_installation::puppet | 32 | contain ::base_installation::puppet |
34 | contain ::base_installation::fstab | ||
35 | } | 33 | } |
diff --git a/modules/base_installation/manifests/params.pp b/modules/base_installation/manifests/params.pp index 2a9fe6a..5ade838 100644 --- a/modules/base_installation/manifests/params.pp +++ b/modules/base_installation/manifests/params.pp | |||
@@ -10,7 +10,6 @@ class base_installation::params { | |||
10 | $ldap_cert_path = "/etc/ssl/certs/ca-certificates.crt" | 10 | $ldap_cert_path = "/etc/ssl/certs/ca-certificates.crt" |
11 | $ldap_uri = "ldaps://ldap.example.com" | 11 | $ldap_uri = "ldaps://ldap.example.com" |
12 | $ldap_server = "ldap.example.com" | 12 | $ldap_server = "ldap.example.com" |
13 | $mounts = [] | ||
14 | $real_hostname = "example.com" | 13 | $real_hostname = "example.com" |
15 | $system_hostname = "example.com" | 14 | $system_hostname = "example.com" |
16 | $system_locales = ["en_US.UTF-8"] | 15 | $system_locales = ["en_US.UTF-8"] |
diff --git a/modules/base_installation/manifests/fstab.pp b/modules/profile/manifests/fstab.pp index f012e76..5f2e58e 100644 --- a/modules/base_installation/manifests/fstab.pp +++ b/modules/profile/manifests/fstab.pp | |||
@@ -1,6 +1,6 @@ | |||
1 | class base_installation::fstab ( | 1 | class profile::fstab ( |
2 | $mounts = $base_installation::mounts | 2 | Optional[Array] $mounts = [] |
3 | ) inherits base_installation { | 3 | ) { |
4 | $mounts.each |$mount| { | 4 | $mounts.each |$mount| { |
5 | unless empty($mount) { | 5 | unless empty($mount) { |
6 | $infos = split($mount, ';') | 6 | $infos = split($mount, ';') |
diff --git a/modules/role/manifests/backup.pp b/modules/role/manifests/backup.pp index edfd5e0..d7ba486 100644 --- a/modules/role/manifests/backup.pp +++ b/modules/role/manifests/backup.pp | |||
@@ -8,6 +8,7 @@ class role::backup ( | |||
8 | ) { | 8 | ) { |
9 | include "base_installation" | 9 | include "base_installation" |
10 | 10 | ||
11 | include "profile::fstab" | ||
11 | include "profile::mail" | 12 | include "profile::mail" |
12 | include "profile::tools" | 13 | include "profile::tools" |
13 | include "profile::xmr_stak" | 14 | include "profile::xmr_stak" |