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 b46c4f4de1d86f5d455987845b8c3532ecc12150..379ea8cc2af0eb0bd47e8dc48bdab76ada267a55 100644 (file)
--- 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",
   "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 0913753ccd0e8538d2128eb355ea1884cda6ce1e..96f3a45bc8d1a8c79e44e7df1b656f2f880ffd6a 100644 (file)
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,23 +1,23 @@
 {
        "templates": {
                "client-mgt": {
 {
        "templates": {
                "client-mgt": {

-                       "path": "./client_mgt",
-                       "title": "Client Mgt",
+                       "path": "./client-mgt",
+                       "title": "Client-Mgt",

                        "description": "Client-Management mit Ansible"
                },
                "server-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": {
                        "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": {
                        "description": "Proxmox-Management mit Ansible"
                },
                "network-mgt": {

-                       "path": "./network_mgt",
-                       "title": "Network Mgt",
+                       "path": "./network-mgt",
+                       "title": "Network-Mgt",

                        "description": "Netzwerk-Management mit Ansible"
                }
        }
                        "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 ce3a59255f216347013c9f1418ea6cdc38ccf203..371a49598c7e31fedbb48259c5a1b7a269385f19 100644 (file)
--- 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"
 }
   "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 420ce8018468f8b14d509c995c63c555c5e30abe..9e43b19c16d2013831ad85637ff40b39f55ac14b 100644 (file)
--- 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"
 }
   "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 (file)
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 6de49187ad3ff99387022520e1c45b166a81382e..9d114ce1d68484dfa54fe021974e12b858f3c63c 100644 (file)
--- 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
 
 [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 (file)
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 (file)
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 (file)
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