diff options
Diffstat (limited to 'environments')
-rw-r--r-- | environments/global/common.yaml | 1 | ||||
-rw-r--r-- | environments/global/types/vps-ovhssd-1.yaml | 1 | ||||
-rw-r--r-- | environments/hiera.yaml | 3 | ||||
l--------- | environments/workstation/hiera.yaml | 1 | ||||
-rw-r--r-- | environments/workstation/machines/flony.yaml | 16 |
5 files changed, 21 insertions, 1 deletions
diff --git a/environments/global/common.yaml b/environments/global/common.yaml index 2f2db35..4313244 100644 --- a/environments/global/common.yaml +++ b/environments/global/common.yaml | |||
@@ -16,6 +16,7 @@ lookup_options: | |||
16 | classes: | 16 | classes: |
17 | stdlib: ~ | 17 | stdlib: ~ |
18 | 18 | ||
19 | base_installation::ldap_enabled: true | ||
19 | base_installation::ldap_base: "dc=immae,dc=eu" | 20 | base_installation::ldap_base: "dc=immae,dc=eu" |
20 | base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae,dc=eu" | 21 | base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae,dc=eu" |
21 | base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" | 22 | base_installation::ldap_cn: "%{facts.ec2_metadata.hostname}" |
diff --git a/environments/global/types/vps-ovhssd-1.yaml b/environments/global/types/vps-ovhssd-1.yaml index 8dd512c..8a8d87b 100644 --- a/environments/global/types/vps-ovhssd-1.yaml +++ b/environments/global/types/vps-ovhssd-1.yaml | |||
@@ -5,7 +5,6 @@ classes: | |||
5 | 5 | ||
6 | base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" | 6 | base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" |
7 | base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" | 7 | base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" |
8 | base_installation::grub_device: "/dev/sdb" | ||
9 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" | 8 | base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" |
10 | letsencrypt::try_for_real_hostname: false | 9 | letsencrypt::try_for_real_hostname: false |
11 | profile::xmr_stak::cpulimit: "90" | 10 | profile::xmr_stak::cpulimit: "90" |
diff --git a/environments/hiera.yaml b/environments/hiera.yaml index 61d40d8..46d560d 100644 --- a/environments/hiera.yaml +++ b/environments/hiera.yaml | |||
@@ -27,6 +27,9 @@ hierarchy: | |||
27 | path: "types/%{facts.ec2_metadata.instance-type}.yaml" | 27 | path: "types/%{facts.ec2_metadata.instance-type}.yaml" |
28 | datadir: ../global | 28 | datadir: ../global |
29 | 29 | ||
30 | - name: "Per-machine data" | ||
31 | path: "machines/%{facts.workstation_name}.yaml" | ||
32 | |||
30 | - name: "Common environment data" | 33 | - name: "Common environment data" |
31 | path: "common.yaml" | 34 | path: "common.yaml" |
32 | 35 | ||
diff --git a/environments/workstation/hiera.yaml b/environments/workstation/hiera.yaml new file mode 120000 index 0000000..91d9bbf --- /dev/null +++ b/environments/workstation/hiera.yaml | |||
@@ -0,0 +1 @@ | |||
../hiera.yaml \ No newline at end of file | |||
diff --git a/environments/workstation/machines/flony.yaml b/environments/workstation/machines/flony.yaml new file mode 100644 index 0000000..71b7e7f --- /dev/null +++ b/environments/workstation/machines/flony.yaml | |||
@@ -0,0 +1,16 @@ | |||
1 | --- | ||
2 | classes: | ||
3 | base_installation: | ||
4 | stage: "setup" | ||
5 | workstation::flony: ~ | ||
6 | |||
7 | base_installation::system_hostname: "%{facts.workstation_name}" | ||
8 | base_installation::real_hostname: "%{facts.workstation_name}.home.immae.eu" | ||
9 | base_installation::cryptroot_device: "81705a1f-b029-46f5-8900-721ede1fe57b" | ||
10 | base_installation::grub_device: "/dev/nvme0n1p2" | ||
11 | base_installation::grub_efi_device: "/dev/nvme0n1p1" | ||
12 | base_installation::ldap_enabled: false | ||
13 | base_installation::system_users: | ||
14 | - userid: 1000 | ||
15 | username: ismael | ||
16 | groups: [wheel] | ||