From eacbef79174c1022f786803d29cab4d2ef4750d1 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Wed, 12 May 2021 16:14:29 +0200
Subject: [PATCH] =?UTF-8?q?nounou=20=E2=86=92=20=5Fnounou?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
host_vars/re2o.adm.crans.org.yml | 4 ++--
host_vars/routeur-sam.adm.crans.org.yml | 4 ++--
roles/crans-scripts/tasks/main.yml | 4 ++--
roles/dns/tasks/main.yml | 4 ++--
roles/firewall/tasks/main.yml | 4 ++--
roles/home/tasks/main.yml | 4 ++--
roles/re2o-dhcp/tasks/main.yml | 4 ++--
roles/re2o-mail-server/tasks/main.yml | 4 ++--
roles/re2o-notif-users/tasks/main.yml | 4 ++--
roles/re2o/tasks/main.yml | 2 +-
roles/slapd/templates/ldap/slapd.conf.j2 | 6 +++---
roles/sudo/templates/sudoers.d/group_privilege.j2 | 2 +-
roles/sudo/templates/sudoers.j2 | 4 ++--
13 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/host_vars/re2o.adm.crans.org.yml b/host_vars/re2o.adm.crans.org.yml
index 33100e22..6460d377 100644
--- a/host_vars/re2o.adm.crans.org.yml
+++ b/host_vars/re2o.adm.crans.org.yml
@@ -6,7 +6,7 @@ interfaces:
loc_re2o:
owner: root
- group: nounou
+ group: _nounou
version: master_freeradius_python3
settings_local_owner: www-data
- settings_local_group: nounou
+ settings_local_group: _nounou
diff --git a/host_vars/routeur-sam.adm.crans.org.yml b/host_vars/routeur-sam.adm.crans.org.yml
index 0ba9d389..e794940d 100644
--- a/host_vars/routeur-sam.adm.crans.org.yml
+++ b/host_vars/routeur-sam.adm.crans.org.yml
@@ -22,7 +22,7 @@ loc_keepalived:
loc_re2o:
owner: freerad
- group: nounou
+ group: _nounou
version: master_freeradius_python3
settings_local_owner: freerad
- settings_local_group: nounou
+ settings_local_group: _nounou
diff --git a/roles/crans-scripts/tasks/main.yml b/roles/crans-scripts/tasks/main.yml
index 43ba45ed..432d9d99 100644
--- a/roles/crans-scripts/tasks/main.yml
+++ b/roles/crans-scripts/tasks/main.yml
@@ -5,13 +5,13 @@
state: directory
mode: "2775"
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for scripts directory
acl:
path: /usr/scripts
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/dns/tasks/main.yml b/roles/dns/tasks/main.yml
index eb3d9958..9a207baa 100644
--- a/roles/dns/tasks/main.yml
+++ b/roles/dns/tasks/main.yml
@@ -17,13 +17,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for dns directory
acl:
path: /var/local/dns
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/firewall/tasks/main.yml b/roles/firewall/tasks/main.yml
index 1d4879ec..9f9e0928 100644
--- a/roles/firewall/tasks/main.yml
+++ b/roles/firewall/tasks/main.yml
@@ -17,13 +17,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for firewall directory
acl:
path: /var/local/firewall
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/home/tasks/main.yml b/roles/home/tasks/main.yml
index e20d0ea4..21f192c0 100644
--- a/roles/home/tasks/main.yml
+++ b/roles/home/tasks/main.yml
@@ -16,13 +16,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for home directory
acl:
path: /var/local/home
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/re2o-dhcp/tasks/main.yml b/roles/re2o-dhcp/tasks/main.yml
index 410be869..90f44669 100644
--- a/roles/re2o-dhcp/tasks/main.yml
+++ b/roles/re2o-dhcp/tasks/main.yml
@@ -5,13 +5,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for re2o-dhcp directory
acl:
path: /var/local/re2o-services/dhcp
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/re2o-mail-server/tasks/main.yml b/roles/re2o-mail-server/tasks/main.yml
index cddb4286..17efe1c7 100644
--- a/roles/re2o-mail-server/tasks/main.yml
+++ b/roles/re2o-mail-server/tasks/main.yml
@@ -5,13 +5,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for re2o-mail-server directory
acl:
path: /var/local/re2o-services/mail-server
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/re2o-notif-users/tasks/main.yml b/roles/re2o-notif-users/tasks/main.yml
index f8ba3588..79a0c932 100644
--- a/roles/re2o-notif-users/tasks/main.yml
+++ b/roles/re2o-notif-users/tasks/main.yml
@@ -5,13 +5,13 @@
state: directory
mode: '2775'
owner: root
- group: nounou
+ group: _nounou
- name: Set ACL for re2o-notif-users directory
acl:
path: /var/local/re2o-services/notif-users
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/re2o/tasks/main.yml b/roles/re2o/tasks/main.yml
index 11bd270f..355f0db5 100644
--- a/roles/re2o/tasks/main.yml
+++ b/roles/re2o/tasks/main.yml
@@ -41,7 +41,7 @@
acl:
path: /var/www/re2o
default: true
- entity: nounou
+ entity: _nounou
etype: group
permissions: rwx
state: query
diff --git a/roles/slapd/templates/ldap/slapd.conf.j2 b/roles/slapd/templates/ldap/slapd.conf.j2
index 6680b9ee..b8bd218b 100644
--- a/roles/slapd/templates/ldap/slapd.conf.j2
+++ b/roles/slapd/templates/ldap/slapd.conf.j2
@@ -162,13 +162,13 @@ overlay syncprov
access to attrs=userPassword,shadowLastChange
by anonymous auth
by self write
- by set="[cn=nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
+ by set="[cn=_nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
by dn="cn=replicator,dc=crans,dc=org" read
by * none
access to attrs=loginShell,mail,telephoneNumber
by self write
- by set="[cn=nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
+ by set="[cn=_nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
by dn="cn=replicator,dc=crans,dc=org" read
by * read
@@ -186,7 +186,7 @@ access to dn.base="" by * read
# The admin dn has full write access, everyone else
# can read everything.
access to *
- by set="[cn=nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
+ by set="[cn=_nounou,ou=group,dc=crans,dc=org]/memberUid & user/uid" write
by dn="cn=replicator,dc=crans,dc=org" read
by * read
{% endif %}
diff --git a/roles/sudo/templates/sudoers.d/group_privilege.j2 b/roles/sudo/templates/sudoers.d/group_privilege.j2
index 54f198cd..7d0fe1d7 100644
--- a/roles/sudo/templates/sudoers.d/group_privilege.j2
+++ b/roles/sudo/templates/sudoers.d/group_privilege.j2
@@ -1,3 +1,3 @@
{{ ansible_header | comment }}
# Group privilege specification
-%nounou ALL=(ALL:ALL) ALL
+NOUNOU ALL=(ALL:ALL) ALL
diff --git a/roles/sudo/templates/sudoers.j2 b/roles/sudo/templates/sudoers.j2
index 8a2525e3..2b635b8c 100644
--- a/roles/sudo/templates/sudoers.j2
+++ b/roles/sudo/templates/sudoers.j2
@@ -7,8 +7,8 @@ Defaults mail_badpass
Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
# Host alias specification
-User_Alias USERS= %user
-User_Alias NOUNOUS= %nounou
+User_Alias USERS= %_user
+User_Alias NOUNOUS= %_nounou
# User alias specification
--
GitLab