kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-07-06 00:33:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed generation of alphanumeric users

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach 2025-07-03 20:00:05 +02:00
parent e032fd1aa4
commit a3fd74c2e0
No known key found for this signature in database
GPG Key ID: 44D8F11FD62F878E
5 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,6 +1,6 @@
ROLES_DIR := ./roles ROLES_DIR := ./roles
APPLICATIONS_OUT := ./group_vars/all/04_applications.yml APPLICATIONS_OUT := ./group_vars/all/04_applications.yml
APPLICATIONS_SCRIPT := ./cli/generate-applications-defaults.py APPLICATIONS_SCRIPT := ./cli/generate_applications.py
USERS_OUT := ./group_vars/all/03_users.yml USERS_OUT := ./group_vars/all/03_users.yml
USERS_SCRIPT := ./cli/generate_users.py USERS_SCRIPT := ./cli/generate_users.py
INCLUDES_OUT := ./tasks/utils/docker-roles.yml INCLUDES_OUT := ./tasks/utils/docker-roles.yml
@ -9,6 +9,7 @@ INCLUDES_SCRIPT := ./cli/generate_playbook.py
EXTRA_USERS := $(shell \ EXTRA_USERS := $(shell \
find $(ROLES_DIR) -maxdepth 1 -type d -name 'docker*' -printf '%f\n' \ find $(ROLES_DIR) -maxdepth 1 -type d -name 'docker*' -printf '%f\n' \
| sed -E 's/^docker[_-]?//' \ | sed -E 's/^docker[_-]?//' \
| grep -E -x '[a-z0-9]+' \
| paste -sd, - \ | paste -sd, - \
) )

0
cli/generate-applications-defaults.py → cli/generate_applications.py
View File

3
roles/user/meta/users.yml
View File

@ -44,9 +44,6 @@ users:
proxy: proxy:
username: proxy username: proxy
description: "Proxy user" description: "Proxy user"
www-data:
username: www-data
description: "Web server user"
backup: backup:
username: backup username: backup
description: "Backup operator" description: "Backup operator"

2
tests/unit/test_generate_applications_defaults_users.py
View File

@ -43,7 +43,7 @@ class TestGenerateDefaultApplicationsUsers(unittest.TestCase):
When a users.yml exists with defined users, the script should inject a 'users' When a users.yml exists with defined users, the script should inject a 'users'
mapping in the generated YAML, mapping each username to a Jinja2 reference. mapping in the generated YAML, mapping each username to a Jinja2 reference.
""" """
script_path = Path(__file__).resolve().parents[2] / "cli" / "generate-applications-defaults.py" script_path = Path(__file__).resolve().parents[2] / "cli" / "generate_applications.py"
result = subprocess.run([ result = subprocess.run([
"python3", str(script_path), "python3", str(script_path),
"--roles-dir", str(self.roles_dir), "--roles-dir", str(self.roles_dir),

2
tests/unit/test_generate_default_applications.py
View File

@ -29,7 +29,7 @@ class TestGenerateDefaultApplications(unittest.TestCase):
shutil.rmtree(self.temp_dir) shutil.rmtree(self.temp_dir)
def test_script_generates_expected_yaml(self): def test_script_generates_expected_yaml(self):
script_path = Path(__file__).resolve().parent.parent.parent / "cli" / "generate-applications-defaults.py" script_path = Path(__file__).resolve().parent.parent.parent / "cli" / "generate_applications.py"
result = subprocess.run( result = subprocess.run(
[ [