Verzeichnisnamen geändert, Proxmox und Netzwerk-Mgt neu

diff --git a/client_mgt/cookiecutter.json b/client-mgt/cookiecutter.json
similarity index 100%
rename from client_mgt/cookiecutter.json
rename to client-mgt/cookiecutter.json

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 80%
rename from client_mgt/{{ cookiecutter.project_slug }}/play.yml
rename to client-mgt/{{ cookiecutter.project_slug }}/play.yml
index 7f0182af979f18d1464390b0ee3043d7362d14f2..9e61221bbb0f7620ddd5cdafb5f61a3711f5d39a 100644 (file)
--- a/client_mgt/{{ cookiecutter.project_slug }}/play.yml
+++ b/client-mgt/{{ cookiecutter.project_slug }}/play.yml
@@ -1,6 +1,6 @@
 ---
 - name: Prepare clients for delivery
 ---
 - name: Prepare clients for delivery

-  hosts: testgruppe medienraum
+  hosts: all

   become: true
   vars_files:
     - ../password-file-clients.yml
   become: true
   vars_files:
     - ../password-file-clients.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 65284be11343aede1e903aba6e7f35f4b193841a..16a86fcc0567d5cfa26ba9ddd8a2a4830f786442 100644 (file)
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,14 +1,24 @@
 {
        "templates": {
 {
        "templates": {

-               "client_mgt": {
-                       "path": "./client_mgt",
+               "client-mgt": {
+                       "path": "./client-mgt",

                        "title": "Client Mgt",
                        "title": "Client Mgt",

-                       "description": "Client-Managemt mit Ansible"
+                       "description": "Client-Management mit Ansible"

                },
                },

-               "server_mgt": {
-                       "path": "./server_mgt",
+               "server-mgt": {
+                       "path": "./server-mgt",

                        "title": "Server Mgt",
                        "title": "Server Mgt",

-                       "description": "Server-Managemt mit Ansible"
+                       "description": "Server-Management mit Ansible"
+               }
+               "proxmox-mgt": {
+                       "path": "./proxmox-mgt",
+                       "title": "Proxmox Mgt",
+                       "description": "Proxmox-Management mit Ansible"
+               }
+               "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 100%
rename from network_mgt/cookiecutter.json
rename to network-mgt/cookiecutter.json

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
new file mode 100644 (file)
index 0000000..902b044
--- /dev/null
+++ b/network-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
@@ -0,0 +1,3 @@
+---
+fsit_nmgt_aptproxy:
+fsit_nmgt_inventory: 

diff --git a/network-mgt/{{ cookiecutter.project_slug }}/hosts b/network-mgt/{{ cookiecutter.project_slug }}/hosts
new file mode 100644 (file)
index 0000000..9c9cde5
--- /dev/null
+++ b/network-mgt/{{ cookiecutter.project_slug }}/hosts
@@ -0,0 +1,7 @@
+[testgruppe]
+
+
+
+
+[all:vars]
+ansible_python_interpreter=/usr/bin/python3

diff --git a/network-mgt/{{ cookiecutter.project_slug }}/play.yml b/network-mgt/{{ cookiecutter.project_slug }}/play.yml
new file mode 100644 (file)
index 0000000..13f81f5
--- /dev/null
+++ b/network-mgt/{{ cookiecutter.project_slug }}/play.yml
@@ -0,0 +1,8 @@
+---
+- name: Ansible for network-devices
+  hosts: all
+  become: true
+  vars_files:
+    - ../password-file-network.yml
+  roles:
+    - fsit_nmgt

diff --git a/network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
new file mode 100644 (file)
index 0000000..e6c1b43
--- /dev/null
+++ b/network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
@@ -0,0 +1,3 @@
+roles:
+  - name: fsit_nmgt
+    src: git+https://freie-schul-it.de/gitweb/fsit_nmgt.git

diff --git a/network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
deleted file mode 100644 (file)
index f5d6958..0000000
--- a/network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-fsit_cmgt_aptproxy: 192.168.9.8
-fsit_cmgt_inventory: inventar
-fsit_cmgt_printserver: druckerzentrale
-# firefox
-fsit_cmgt_blocked_install_message: Bitte wende Dich an die IT-AG.
-fsit_cmgt_homepage_url: http://startseite.alternativschule-berlin.de
-fsit_cmgt_requested_locales: '"de", "es-ES"'
-fsit_cmgt_searchengine: DuckDuckGo

diff --git a/network_mgt/{{ cookiecutter.project_slug }}/hosts b/network_mgt/{{ cookiecutter.project_slug }}/hosts
deleted file mode 100644 (file)
index baa67e2..0000000
--- a/network_mgt/{{ cookiecutter.project_slug }}/hosts
+++ /dev/null
@@ -1,32 +0,0 @@
-[testgruppe]
-
-[buero]
-
-[notebooks_wlp2s0]
-
-[notebooks_wlp3s0]
-
-[notebooks_wlp4s0]
-
-[desktops]
-
-[medienraum]
-
-
-[notebooks:children]
-notebooks_wlp2s0
-notebooks_wlp3s0
-notebooks_wlp4s0
-
-# vars
-[notebooks_wlp2s0:vars]
-wifi_ifname=wlp2s0
-
-[notebooks_wlp3s0:vars]
-wifi_ifname=wlp3s0
-
-[notebooks_wlp4s0:vars]
-wifi_ifname=wlp4s0
-
-[all:vars]
-ansible_python_interpreter=/usr/bin/python3

diff --git a/network_mgt/{{ cookiecutter.project_slug }}/play.yml b/network_mgt/{{ cookiecutter.project_slug }}/play.yml
deleted file mode 100644 (file)
index 7f0182a..0000000
--- a/network_mgt/{{ cookiecutter.project_slug }}/play.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare clients for delivery
-  hosts: testgruppe medienraum
-  become: true
-  vars_files:
-    - ../password-file-clients.yml
-  roles:
-    - fsit_cmgt

diff --git a/network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
deleted file mode 100644 (file)
index 41f7248..0000000
--- a/network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-roles:
-  - name: fsit_cmgt
-    src: hit+https://freie-schul-it.de/gitweb/fsit_cmgt.git

diff --git a/proxmox-mgt/cookiecutter.json b/proxmox-mgt/cookiecutter.json
new file mode 100644 (file)
index 0000000..420ce80
--- /dev/null
+++ b/proxmox-mgt/cookiecutter.json
@@ -0,0 +1,5 @@
+{
+  "project_name": "Proxmox Mgt",
+  "project_slug": "{{ cookiecutter.project_name.lower().replace(' ', '_') }}",
+  "author": "fsit"
+}

diff --git a/server_mgt/{{ cookiecutter.project_slug }}/Makefile b/proxmox-mgt/{{ cookiecutter.project_slug }}/Makefile
similarity index 100%
rename from server_mgt/{{ cookiecutter.project_slug }}/Makefile
rename to proxmox-mgt/{{ cookiecutter.project_slug }}/Makefile

diff --git a/server_mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/proxmox-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
similarity index 100%
rename from server_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
new file mode 100644 (file)
index 0000000..902b044
--- /dev/null
+++ b/proxmox-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
@@ -0,0 +1,3 @@
+---
+fsit_nmgt_aptproxy:
+fsit_nmgt_inventory: 

diff --git a/proxmox-mgt/{{ cookiecutter.project_slug }}/hosts b/proxmox-mgt/{{ cookiecutter.project_slug }}/hosts
new file mode 100644 (file)
index 0000000..65c702a
--- /dev/null
+++ b/proxmox-mgt/{{ cookiecutter.project_slug }}/hosts
@@ -0,0 +1,10 @@
+[testgruppe]
+
+[cluster]
+
+[backup]
+
+[standalone]
+
+[all:vars]
+ansible_python_interpreter=/usr/bin/python3

diff --git a/proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml b/proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml
new file mode 100644 (file)
index 0000000..a31a131
--- /dev/null
+++ b/proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml
@@ -0,0 +1,8 @@
+---
+- name: Ansible for proxmox server
+  hosts: all
+  become: true
+  vars_files:
+    - ../password-file-proxmox.yml
+  roles:
+    - fsit_pmgt

diff --git a/proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml b/proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
new file mode 100644 (file)
index 0000000..b186f51
--- /dev/null
+++ b/proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
@@ -0,0 +1,3 @@
+roles:
+  - name: fsit_pmgt
+    src: git+https://freie-schul-it.de/gitweb/fsit_pmgt.git

diff --git a/server_mgt/cookiecutter.json b/server-mgt/cookiecutter.json
similarity index 100%
rename from server_mgt/cookiecutter.json
rename to server-mgt/cookiecutter.json

diff --git a/server-mgt/{{ cookiecutter.project_slug }}/Makefile b/server-mgt/{{ cookiecutter.project_slug }}/Makefile
new file mode 100644 (file)
index 0000000..083f906
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/Makefile
@@ -0,0 +1,3 @@
+all:
+       ansible-galaxy install -f -r roles/requirements.yml
+       ansible-playbook play.yml --diff

diff --git a/server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg b/server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
new file mode 100644 (file)
index 0000000..aa937e8
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg
@@ -0,0 +1,4 @@
+[defaults]
+inventory = ./hosts
+retry_files_enabled = True
+retry_files_save_path = retry-files

diff --git a/server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
new file mode 100644 (file)
index 0000000..8d251a3
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
@@ -0,0 +1,3 @@
+---
+fsit_smgt_aptproxy:
+fsit_smgt_inventory:

diff --git a/server-mgt/{{ cookiecutter.project_slug }}/hosts b/server-mgt/{{ cookiecutter.project_slug }}/hosts
new file mode 100644 (file)
index 0000000..6de4918
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/hosts
@@ -0,0 +1,8 @@
+[testgruppe]
+
+[newserver]
+
+
+
+[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..d991ca3
--- /dev/null
+++ b/server-mgt/{{ cookiecutter.project_slug }}/play.yml
@@ -0,0 +1,8 @@
+---
+- name: Ansible server
+  hosts: newserver
+  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 77%
rename from server_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
rename to server-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
index 0ccb88e570ea463234fcca7304c68eb42cc329f6..a51cd0fc5a00f2a9bb6e5c696823d0d141878b74 100644 (file)
--- a/server_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
+++ b/server-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml
@@ -1,3 +1,3 @@
 roles:
 roles:

-  - name: fsit_cmgt
+  - name: fsit_smgt

     src: git+https://freie-schul-it.de/gitweb/fsit_smgt.git
     src: git+https://freie-schul-it.de/gitweb/fsit_smgt.git

diff --git a/server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml b/server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
deleted file mode 100644 (file)
index f5d6958..0000000
--- a/server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-fsit_cmgt_aptproxy: 192.168.9.8
-fsit_cmgt_inventory: inventar
-fsit_cmgt_printserver: druckerzentrale
-# firefox
-fsit_cmgt_blocked_install_message: Bitte wende Dich an die IT-AG.
-fsit_cmgt_homepage_url: http://startseite.alternativschule-berlin.de
-fsit_cmgt_requested_locales: '"de", "es-ES"'
-fsit_cmgt_searchengine: DuckDuckGo

diff --git a/server_mgt/{{ cookiecutter.project_slug }}/hosts b/server_mgt/{{ cookiecutter.project_slug }}/hosts
deleted file mode 100644 (file)
index baa67e2..0000000
--- a/server_mgt/{{ cookiecutter.project_slug }}/hosts
+++ /dev/null
@@ -1,32 +0,0 @@
-[testgruppe]
-
-[buero]
-
-[notebooks_wlp2s0]
-
-[notebooks_wlp3s0]
-
-[notebooks_wlp4s0]
-
-[desktops]
-
-[medienraum]
-
-
-[notebooks:children]
-notebooks_wlp2s0
-notebooks_wlp3s0
-notebooks_wlp4s0
-
-# vars
-[notebooks_wlp2s0:vars]
-wifi_ifname=wlp2s0
-
-[notebooks_wlp3s0:vars]
-wifi_ifname=wlp3s0
-
-[notebooks_wlp4s0:vars]
-wifi_ifname=wlp4s0
-
-[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
deleted file mode 100644 (file)
index 7f0182a..0000000
--- a/server_mgt/{{ cookiecutter.project_slug }}/play.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Prepare clients for delivery
-  hosts: testgruppe medienraum
-  become: true
-  vars_files:
-    - ../password-file-clients.yml
-  roles:
-    - fsit_cmgt