From 98a071604ea9f7569aa0fa0688bc9d35081770c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 2 Oct 2018 22:53:29 +0200 Subject: Add Flony workstation --- environments/global/common.yaml | 1 + environments/global/types/vps-ovhssd-1.yaml | 1 - environments/hiera.yaml | 3 +++ environments/workstation/hiera.yaml | 1 + environments/workstation/machines/flony.yaml | 16 ++++++++++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) create mode 120000 environments/workstation/hiera.yaml create mode 100644 environments/workstation/machines/flony.yaml (limited to 'environments') 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: classes: stdlib: ~ +base_installation::ldap_enabled: true base_installation::ldap_base: "dc=immae,dc=eu" base_installation::ldap_dn: "cn=%{facts.ec2_metadata.hostname},ou=hosts,dc=immae,dc=eu" 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: base_installation::system_hostname: "%{ldapvar.self.vars.host.0}" base_installation::real_hostname: "%{facts.ec2_metadata.hostname}.ovh.net" -base_installation::grub_device: "/dev/sdb" base_installation::ldap_cert_path: "/etc/ssl/certs/ca-certificates.crt" letsencrypt::try_for_real_hostname: false 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: path: "types/%{facts.ec2_metadata.instance-type}.yaml" datadir: ../global + - name: "Per-machine data" + path: "machines/%{facts.workstation_name}.yaml" + - name: "Common environment data" path: "common.yaml" 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 @@ +--- +classes: + base_installation: + stage: "setup" + workstation::flony: ~ + +base_installation::system_hostname: "%{facts.workstation_name}" +base_installation::real_hostname: "%{facts.workstation_name}.home.immae.eu" +base_installation::cryptroot_device: "81705a1f-b029-46f5-8900-721ede1fe57b" +base_installation::grub_device: "/dev/nvme0n1p2" +base_installation::grub_efi_device: "/dev/nvme0n1p1" +base_installation::ldap_enabled: false +base_installation::system_users: + - userid: 1000 + username: ismael + groups: [wheel] -- cgit v1.2.3