Browse Source

sudo: Update sudo state to reflect new Salt layout and new Debian config file (whitespace diff only).

Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
Maximilian Wilhelm 3 years ago
parent
commit
1f25159228
6 changed files with 5 additions and 26 deletions
  1. 0 8
      sudo/ffho.tmpl
  2. 0 4
      sudo/hosts/services.in.ffho.net
  3. 0 5
      sudo/init.sls
  4. 0 3
      sudo/roles/gateway
  5. 0 1
      sudo/roles/kvm_host
  6. 5 5
      sudo/sudoers

+ 0 - 8
sudo/ffho.tmpl

@@ -1,8 +0,0 @@
-{%- import "globals.sls" as globals with context %}
-
-{% for role in globals.ROLES %}
-  {%- set file = "sudo/roles/" + role %}
-  {%- include file ignore missing %}
-{% endfor %}
-
-{%- include "sudo/hosts/" + grains['id'] ignore missing %}

+ 0 - 4
sudo/hosts/services.in.ffho.net

@@ -1,4 +0,0 @@
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_gw_mesh
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_gw_mesh_comm
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_bat0_health
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_rouge_gw

+ 0 - 5
sudo/init.sls

@@ -16,8 +16,3 @@ sudo:
 /etc/sudoers:
   file.managed:
     - source: salt://sudo/sudoers
-
-/etc/sudoers.d/ffho:
-  file.managed:
-    - source: salt://sudo/ffho.tmpl
-    - template: jinja

+ 0 - 3
sudo/roles/gateway

@@ -1,3 +0,0 @@
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_gw_mesh
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_gw_mesh_comm
-nagios  ALL=NOPASSWD:/usr/local/share/nagios/plugins/check_bat0_health

+ 0 - 1
sudo/roles/kvm_host

@@ -1 +0,0 @@
-nagios  ALL=NOPASSWD:/usr/lib/nagios/plugins/check_kvm

+ 5 - 5
sudo/sudoers

@@ -6,9 +6,9 @@
 #
 # See the man page for details on how to write a sudoers file.
 #
-Defaults        env_reset
-Defaults        mail_badpass
-Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+Defaults	env_reset
+Defaults	mail_badpass
+Defaults	secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 # Host alias specification
 
@@ -17,10 +17,10 @@ Defaults        secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/
 # Cmnd alias specification
 
 # User privilege specification
-root    ALL=(ALL:ALL) ALL
+root	ALL=(ALL:ALL) ALL
 
 # Allow members of group sudo to execute any command
-%sudo   ALL=(ALL:ALL) ALL
+%sudo	ALL=(ALL:ALL) ALL
 
 # See sudoers(5) for more information on "#include" directives: