moved FIXMEs to an external list
This commit is contained in:
@@ -18,8 +18,6 @@
|
|||||||
- git: /usr/local/lib/nagios
|
- git: /usr/local/lib/nagios
|
||||||
- pkg: monitoring_packages
|
- pkg: monitoring_packages
|
||||||
|
|
||||||
# TODO: make all this venv stuff a cmd.script
|
|
||||||
|
|
||||||
venv-ensurepip:
|
venv-ensurepip:
|
||||||
cmd.run:
|
cmd.run:
|
||||||
- name: /usr/local/lib/nagios/venv/bin/python3 -m ensurepip
|
- name: /usr/local/lib/nagios/venv/bin/python3 -m ensurepip
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ restic-{{ name }}:
|
|||||||
- user: restic-{{ name }}
|
- user: restic-{{ name }}
|
||||||
- group: restic-{{ name }}
|
- group: restic-{{ name }}
|
||||||
- mode: 400
|
- 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 }}
|
- contents: {{ salt.mine.get(minion_id, 'root_id_rsa_pub').get(minion_id, "") | yaml_encode }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|||||||
@@ -106,7 +106,6 @@ salt-{{ daemon }}:
|
|||||||
- file: /etc/salt/{{ daemon }}
|
- file: /etc/salt/{{ daemon }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
# FIXME: D.R.Y.
|
|
||||||
salt-common:
|
salt-common:
|
||||||
pkg.installed:
|
pkg.installed:
|
||||||
- version: '{{ salt.pillar.get("salt:version") }}'
|
- version: '{{ salt.pillar.get("salt:version") }}'
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Managed by Salt
|
# Managed by Salt
|
||||||
# TODO: this could use file.serialize
|
|
||||||
# run testparm -s after making changes to validate them
|
# run testparm -s after making changes to validate them
|
||||||
|
|
||||||
[global]
|
[global]
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
{% set home = '' if user == 'root' else '/home' %}
|
{% set home = '' if user == 'root' else '/home' %}
|
||||||
|
|
||||||
{% if user != 'root' %}
|
{% if user != 'root' %}
|
||||||
# FIXME - both config and auth keys need this and this logic is dumb
|
|
||||||
{{ home }}/{{ user }}/.ssh:
|
{{ home }}/{{ user }}/.ssh:
|
||||||
file.directory:
|
file.directory:
|
||||||
- user: {{ user }}
|
- user: {{ user }}
|
||||||
|
|||||||
Reference in New Issue
Block a user