From d4c3fb11d3aae35311c7672a332accf7ddaa24aa Mon Sep 17 00:00:00 2001 From: Ben Grande Date: Thu, 16 May 2024 18:24:03 +0200 Subject: [PATCH] feat: add terraform and chrome fedora repositories --- salt/browser/files/repo/chrome.yum.asc | 1 + salt/browser/files/repo/chrome.yum.repo | 8 ++++++++ salt/sys-syncthing/install-client.sls | 6 ++++++ salt/sys-syncthing/install.sls | 4 ++++ salt/terraform/files/repo/terraform.yum.asc | 1 + salt/terraform/files/repo/terraform.yum.repo | 15 +++++++++++++++ 6 files changed, 35 insertions(+) create mode 120000 salt/browser/files/repo/chrome.yum.asc create mode 100644 salt/browser/files/repo/chrome.yum.repo create mode 120000 salt/terraform/files/repo/terraform.yum.asc create mode 100644 salt/terraform/files/repo/terraform.yum.repo diff --git a/salt/browser/files/repo/chrome.yum.asc b/salt/browser/files/repo/chrome.yum.asc new file mode 120000 index 0000000..a6ad8dc --- /dev/null +++ b/salt/browser/files/repo/chrome.yum.asc @@ -0,0 +1 @@ +chrome.asc \ No newline at end of file diff --git a/salt/browser/files/repo/chrome.yum.repo b/salt/browser/files/repo/chrome.yum.repo new file mode 100644 index 0000000..ddbfd39 --- /dev/null +++ b/salt/browser/files/repo/chrome.yum.repo @@ -0,0 +1,8 @@ +[google-chrome] +name=google-chrome - $basearch +baseurl=http://dl.google.com/linux/chrome/rpm/stable/$basearch +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-chrome + +# vim: ft=toml diff --git a/salt/sys-syncthing/install-client.sls b/salt/sys-syncthing/install-client.sls index d0bcf5a..c0f7e96 100644 --- a/salt/sys-syncthing/install-client.sls +++ b/salt/sys-syncthing/install-client.sls @@ -6,13 +6,19 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} +{% if grains['os_family']|lower == 'debian' -%} include: + - .install-repo - utils.tools.common.update +{% endif -%} "{{ slsdotpath }}-installed": pkg.installed: + {% if grains['os_family']|lower == 'debian' -%} - require: + - sls: {{ slsdotpath }}.install-repo - sls: utils.tools.common.update + {% endif %} - install_recommends: False - skip_suggestions: True - pkgs: diff --git a/salt/sys-syncthing/install.sls b/salt/sys-syncthing/install.sls index 48fb86a..6e4f25b 100644 --- a/salt/sys-syncthing/install.sls +++ b/salt/sys-syncthing/install.sls @@ -7,15 +7,19 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} +{% if grains['os_family']|lower == 'debian' -%} include: - .install-repo - utils.tools.common.update +{% endif -%} "{{ slsdotpath }}-installed": pkg.installed: + {% if grains['os_family']|lower == 'debian' %} - require: - sls: {{ slsdotpath }}.install-repo - sls: utils.tools.common.update + {% endif %} - install_recommends: False - skip_suggestions: True - pkgs: diff --git a/salt/terraform/files/repo/terraform.yum.asc b/salt/terraform/files/repo/terraform.yum.asc new file mode 120000 index 0000000..5d9db0a --- /dev/null +++ b/salt/terraform/files/repo/terraform.yum.asc @@ -0,0 +1 @@ +terraform.asc \ No newline at end of file diff --git a/salt/terraform/files/repo/terraform.yum.repo b/salt/terraform/files/repo/terraform.yum.repo new file mode 100644 index 0000000..908effa --- /dev/null +++ b/salt/terraform/files/repo/terraform.yum.repo @@ -0,0 +1,15 @@ +[hashicorp] +name=Hashicorp Stable - $basearch +baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https:///etc/pki/rpm-gpg/RPM-GPG-KEY-terraform + +[hashicorp-test] +name=Hashicorp Test - $basearch +baseurl=https://rpm.releases.hashicorp.com/fedora/$releasever/$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https:///etc/pki/rpm-gpg/RPM-GPG-KEY-terraform + +# vim: ft=toml