From: Ullli <ullli@freie-schul-it.de>
Date: Thu, 21 May 2026 17:01:29 +0000 (+0200)
Subject: Mgt-Verzeichnisse mit Bindestrich sowie smgt erweitert
X-Git-Url: https://freie-schul-it.de/gitweb/cookiecutter-fsit.git/commitdiff_plain/a1f77711202d565e7f26673e1e18db98439e8091?ds=sidebyside

Mgt-Verzeichnisse mit Bindestrich sowie smgt erweitert
---

diff --git a/client_mgt/cookiecutter.json b/client-mgt/cookiecutter.json
similarity index 93%
rename from client_mgt/cookiecutter.json
rename to client-mgt/cookiecutter.json
index b46c4f4..379ea8c 100644
--- a/client_mgt/cookiecutter.json
+++ b/client-mgt/cookiecutter.json
@@ -1,5 +1,5 @@
 {
-  "project_name": "Client Mgt",
+  "project_name": "Client-Mgt",
   "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
   "author": "fsit",
   "fsit_cmgt_aptproxy": "172.SchulNr.10.IP",
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/Makefile b/client-mgt/{{ cookiecutter.project_slug }}/Makefile
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/Makefile
rename to client-mgt/{{ cookiecutter.project_slug }}/Makefile
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/client-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/ansible.cfg
rename to client-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/client-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/group_vars/medienraum.yml b/client-mgt/{{ cookiecutter.project_slug }}/group_vars/medienraum.yml
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/group_vars/medienraum.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/group_vars/medienraum.yml
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/group_vars/testgruppe.yml b/client-mgt/{{ cookiecutter.project_slug }}/group_vars/testgruppe.yml
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/group_vars/testgruppe.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/group_vars/testgruppe.yml
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/hosts b/client-mgt/{{ cookiecutter.project_slug }}/hosts
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/hosts
rename to client-mgt/{{ cookiecutter.project_slug }}/hosts
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/play.yml b/client-mgt/{{ cookiecutter.project_slug }}/play.yml
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/play.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/play.yml
diff --git a/client_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/client-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
similarity index 100%
rename from client_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
diff --git a/cookiecutter.json b/cookiecutter.json
index 0913753..96f3a45 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,23 +1,23 @@
 {
 	"templates": {
 		"client-mgt": {
-			"path": "./client_mgt",
-			"title": "Client Mgt",
+			"path": "./client-mgt",
+			"title": "Client-Mgt",
 			"description": "Client-Management mit Ansible"
 		},
 		"server-mgt": {
-			"path": "./server_mgt",
-			"title": "Server Mgt",
+			"path": "./server-mgt",
+			"title": "Server-Mgt",
 			"description": "Server-Management mit Ansible"
 		},
 		"proxmox-mgt": {
-			"path": "./proxmox_mgt",
-			"title": "Proxmox Mgt",
+			"path": "./proxmox-mgt",
+			"title": "Proxmox-Mgt",
 			"description": "Proxmox-Management mit Ansible"
 		},
 		"network-mgt": {
-			"path": "./network_mgt",
-			"title": "Network Mgt",
+			"path": "./network-mgt",
+			"title": "Network-Mgt",
 			"description": "Netzwerk-Management mit Ansible"
 		}
 	}
diff --git a/network_mgt/cookiecutter.json b/network-mgt/cookiecutter.json
similarity index 75%
rename from network_mgt/cookiecutter.json
rename to network-mgt/cookiecutter.json
index ce3a592..371a495 100644
--- a/network_mgt/cookiecutter.json
+++ b/network-mgt/cookiecutter.json
@@ -1,5 +1,5 @@
 {
-  "project_name": "Network Mgt",
+  "project_name": "Network-Mgt",
   "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
   "author": "fsit"
 }
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/Makefile b/network-mgt/{{ cookiecutter.project_slug }}/Makefile
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/Makefile
rename to network-mgt/{{ cookiecutter.project_slug }}/Makefile
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/network-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/ansible.cfg
rename to network-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/network-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
rename to network-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/hosts b/network-mgt/{{ cookiecutter.project_slug }}/hosts
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/hosts
rename to network-mgt/{{ cookiecutter.project_slug }}/hosts
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/play.yml b/network-mgt/{{ cookiecutter.project_slug }}/play.yml
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/play.yml
rename to network-mgt/{{ cookiecutter.project_slug }}/play.yml
diff --git a/network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
similarity index 100%
rename from network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
rename to network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
diff --git a/proxmox_mgt/cookiecutter.json b/proxmox-mgt/cookiecutter.json
similarity index 75%
rename from proxmox_mgt/cookiecutter.json
rename to proxmox-mgt/cookiecutter.json
index 420ce80..9e43b19 100644
--- a/proxmox_mgt/cookiecutter.json
+++ b/proxmox-mgt/cookiecutter.json
@@ -1,5 +1,5 @@
 {
-  "project_name": "Proxmox Mgt",
+  "project_name": "Proxmox-Mgt",
   "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
   "author": "fsit"
 }
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/Makefile b/proxmox-mgt/{{ cookiecutter.project_slug }}/Makefile
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/Makefile
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/Makefile
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/proxmox-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/ansible.cfg
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/proxmox-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/hosts b/proxmox-mgt/{{ cookiecutter.project_slug }}/hosts
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/hosts
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/hosts
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/play.yml b/proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/play.yml
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml
diff --git a/proxmox_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
similarity index 100%
rename from proxmox_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
diff --git a/server-mgt/cookiecutter.json b/server-mgt/cookiecutter.json
new file mode 100644
index 0000000..a817540
--- /dev/null
+++ b/server-mgt/cookiecutter.json
@@ -0,0 +1,6 @@
+{
+  "project_name": "Server-Mgt",
+  "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
+  "author": "fsit",
+  "fsit_smgt_aptproxy": "172.SchulNr.10.IP"
+}
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/Makefile b/server-mgt/{{ cookiecutter.project_slug }}/Makefile
similarity index 100%
rename from server_mgt/{{ cookiecutter.project_slug }}/Makefile
rename to server-mgt/{{ cookiecutter.project_slug }}/Makefile
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
similarity index 100%
rename from server_mgt/{{ cookiecutter.project_slug }}/ansible.cfg
rename to server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
similarity index 100%
rename from server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
rename to server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/hosts b/server-mgt/{{ cookiecutter.project_slug }}/hosts
similarity index 50%
rename from server_mgt/{{ cookiecutter.project_slug }}/hosts
rename to server-mgt/{{ cookiecutter.project_slug }}/hosts
index 6de4918..9d114ce 100644
--- a/server_mgt/{{ cookiecutter.project_slug }}/hosts	
+++ b/server-mgt/{{ cookiecutter.project_slug }}/hosts	
@@ -1,8 +1,15 @@
-[testgruppe]
+[installbox]
+#installbox
+
+[pihole]
 
-[newserver]
+[samba-fs]
 
+[lighttpd]
 
+[baremetal]
+
+[testgruppe]
 
 [all:vars]
 ansible_python_interpreter=/usr/bin/python3
diff --git a/server-mgt/{{ cookiecutter.project_slug }}/play.yml b/server-mgt/{{ cookiecutter.project_slug }}/play.yml
new file mode 100644
index 0000000..64b72ad
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/play.yml	
@@ -0,0 +1,16 @@
+---
+- name: Add ansible-user to new servers
+  hosts: all
+  remote_user: root
+  tasks:
+    - name: Use task from role
+      ansible.builtin.include_role:
+        name: fsit_smgt
+        tasks_from: add_ansible_user.yml
+- name: Manage all servers for ASB
+  hosts: pihole
+  become: true
+  vars_files:
+    - ../password-file-server.yml
+  roles:
+    - fsit_smgt
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/server-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
similarity index 100%
rename from server_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
rename to server-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
diff --git a/server_mgt/cookiecutter.json b/server_mgt/cookiecutter.json
deleted file mode 100644
index da6f908..0000000
--- a/server_mgt/cookiecutter.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "project_name": "Server Mgt",
-  "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
-  "author": "fsit"
-}
diff --git a/server_mgt/{{ cookiecutter.project_slug }}/play.yml b/server_mgt/{{ cookiecutter.project_slug }}/play.yml
deleted file mode 100644
index d991ca3..0000000
--- a/server_mgt/{{ cookiecutter.project_slug }}/play.yml	
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Ansible server
-  hosts: newserver
-  become: true
-  vars_files:
-    - ../password-file-server.yml
-  roles:
-    - fsit_smgt