From 1a0b72c67c817050cd2e2d830ea399cf4bb31bbb Mon Sep 17 00:00:00 2001 From: Terry Derks Date: Mon, 11 Dec 2023 02:24:18 -0500 Subject: [PATCH] moved FIXMEs to an external list --- icinga2/plugins.sls | 2 -- restic/init.sls | 1 - salt/init.sls | 1 - samba/files/smb.conf.jinja | 1 - users/init.sls | 1 - 5 files changed, 6 deletions(-) diff --git a/icinga2/plugins.sls b/icinga2/plugins.sls index 3b53e26..c090e4f 100644 --- a/icinga2/plugins.sls +++ b/icinga2/plugins.sls @@ -18,8 +18,6 @@ - git: /usr/local/lib/nagios - pkg: monitoring_packages -# TODO: make all this venv stuff a cmd.script - venv-ensurepip: cmd.run: - name: /usr/local/lib/nagios/venv/bin/python3 -m ensurepip diff --git a/restic/init.sls b/restic/init.sls index 5a8f3ca..9abd102 100644 --- a/restic/init.sls +++ b/restic/init.sls @@ -15,7 +15,6 @@ restic-{{ name }}: - user: restic-{{ name }} - group: restic-{{ name }} - mode: 400 - # TODO: we don't ensure a root rsa key exists on the minion - contents: {{ salt.mine.get(minion_id, 'root_id_rsa_pub').get(minion_id, "") | yaml_encode }} {% endfor %} diff --git a/salt/init.sls b/salt/init.sls index ac38c87..b2ea9de 100644 --- a/salt/init.sls +++ b/salt/init.sls @@ -106,7 +106,6 @@ salt-{{ daemon }}: - file: /etc/salt/{{ daemon }} {% endfor %} -# FIXME: D.R.Y. salt-common: pkg.installed: - version: '{{ salt.pillar.get("salt:version") }}' diff --git a/samba/files/smb.conf.jinja b/samba/files/smb.conf.jinja index f2d1598..cbbc9f4 100644 --- a/samba/files/smb.conf.jinja +++ b/samba/files/smb.conf.jinja @@ -1,6 +1,5 @@ # # Managed by Salt -# TODO: this could use file.serialize # run testparm -s after making changes to validate them [global] diff --git a/users/init.sls b/users/init.sls index 2cd3856..ab7f96f 100644 --- a/users/init.sls +++ b/users/init.sls @@ -3,7 +3,6 @@ {% set home = '' if user == 'root' else '/home' %} {% if user != 'root' %} - # FIXME - both config and auth keys need this and this logic is dumb {{ home }}/{{ user }}/.ssh: file.directory: - user: {{ user }}