diff --git a/roles/shellserver/init.sls b/roles/shellserver/init.sls --- a/roles/shellserver/init.sls +++ b/roles/shellserver/init.sls @@ -12,6 +12,7 @@ - .web-hosting - .database - .quassel-core + - .vault # Services hosted - .odderon diff --git a/roles/shellserver/vault/files/hashicorp-archive-keyring.gpg b/roles/shellserver/vault/files/hashicorp-archive-keyring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@<O00001 literal 0 Hc$@<O00001 diff --git a/roles/shellserver/vault/files/hashicorp.list b/roles/shellserver/vault/files/hashicorp.list new file mode 100644 --- /dev/null +++ b/roles/shellserver/vault/files/hashicorp.list @@ -0,0 +1,16 @@ +# ------------------------------------------------------------- +# HashiCorp repository +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Eglide +# License: Trivial work, not eligible to copyright +# Source file: roles/shellserver/vault/files/hashicorp.list +# ------------------------------------------------------------- +# +# <auto-generated> +# This file is managed by our rOPS SaltStack repository. +# +# Changes to this file may cause incorrect behavior +# and will be lost if the state is redeployed. +# </auto-generated> + +deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com bullseye main diff --git a/roles/shellserver/init.sls b/roles/shellserver/vault/init.sls copy from roles/shellserver/init.sls copy to roles/shellserver/vault/init.sls --- a/roles/shellserver/init.sls +++ b/roles/shellserver/vault/init.sls @@ -1,17 +1,9 @@ # ------------------------------------------------------------- # Salt — Shell server's units # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# Project: Nasqueron +# Project: Eglide # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- include: - # System features - - .userland-software - - .vhosts - - .web-hosting - - .database - - .quassel-core - - # Services hosted - - .odderon + - .software diff --git a/roles/shellserver/vault/software.sls b/roles/shellserver/vault/software.sls new file mode 100644 --- /dev/null +++ b/roles/shellserver/vault/software.sls @@ -0,0 +1,31 @@ +# ------------------------------------------------------------- +# Salt — Shell server's units +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# Project: Eglide +# License: Trivial work, not eligible to copyright +# ------------------------------------------------------------- + +# ------------------------------------------------------------- +# HashiCorp repository +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{% if grains["os_family"] == "Debian" %} + +/usr/share/keyrings/hashicorp-archive-keyring.gpg: + file.managed: + - source: salt://roles/shellserver/vault/files/hashicorp-archive-keyring.gpg + - mode: 644 + +/etc/apt/sources.list.d/hashicorp.list: + file.managed: + - source: salt://roles/shellserver/vault/files/hashicorp.list + - mode: 644 + +{% endif %} + +# ------------------------------------------------------------- +# Vault +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +vault: + pkg.installed