From 4cb831a3d5668ecf0042231670aef8f27af4b20f Mon Sep 17 00:00:00 2001 From: Ullli Date: Wed, 29 Apr 2026 16:36:24 +0200 Subject: [PATCH 1/1] =?utf8?q?Verzeichnisnamen=20ge=C3=A4ndert,=20Proxmox?= =?utf8?q?=20und=20Netzwerk-Mgt=20neu?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- {client_mgt => client-mgt}/cookiecutter.json | 0 .../{{ cookiecutter.project_slug }}/Makefile | 0 .../ansible.cfg | 0 .../group_vars/all.yml | 0 .../group_vars/medienraum.yml | 0 .../group_vars/testgruppe.yml | 0 .../{{ cookiecutter.project_slug }}/hosts | 0 .../{{ cookiecutter.project_slug }}/play.yml | 2 +- .../roles/requirements.yml | 0 cookiecutter.json | 22 +++++++++---- .../cookiecutter.json | 0 .../{{ cookiecutter.project_slug }}/Makefile | 0 .../ansible.cfg | 0 .../group_vars/all.yml | 3 ++ .../{{ cookiecutter.project_slug }}/hosts | 7 ++++ .../{{ cookiecutter.project_slug }}/play.yml | 8 +++++ .../roles/requirements.yml | 3 ++ .../group_vars/all.yml | 9 ------ .../{{ cookiecutter.project_slug }}/hosts | 32 ------------------- .../{{ cookiecutter.project_slug }}/play.yml | 8 ----- .../roles/requirements.yml | 3 -- proxmox-mgt/cookiecutter.json | 5 +++ .../{{ cookiecutter.project_slug }}/Makefile | 0 .../ansible.cfg | 0 .../group_vars/all.yml | 3 ++ .../{{ cookiecutter.project_slug }}/hosts | 10 ++++++ .../{{ cookiecutter.project_slug }}/play.yml | 8 +++++ .../roles/requirements.yml | 3 ++ {server_mgt => server-mgt}/cookiecutter.json | 0 .../{{ cookiecutter.project_slug }}/Makefile | 3 ++ .../ansible.cfg | 4 +++ .../group_vars/all.yml | 3 ++ .../{{ cookiecutter.project_slug }}/hosts | 8 +++++ .../{{ cookiecutter.project_slug }}/play.yml | 8 +++++ .../roles/requirements.yml | 2 +- .../group_vars/all.yml | 9 ------ .../{{ cookiecutter.project_slug }}/hosts | 32 ------------------- .../{{ cookiecutter.project_slug }}/play.yml | 8 ----- 38 files changed, 94 insertions(+), 109 deletions(-) rename {client_mgt => client-mgt}/cookiecutter.json (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/Makefile (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/ansible.cfg (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/group_vars/all.yml (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/group_vars/medienraum.yml (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/group_vars/testgruppe.yml (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/hosts (100%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/play.yml (80%) rename {client_mgt => client-mgt}/{{ cookiecutter.project_slug }}/roles/requirements.yml (100%) rename {network_mgt => network-mgt}/cookiecutter.json (100%) rename {network_mgt => network-mgt}/{{ cookiecutter.project_slug }}/Makefile (100%) rename {network_mgt => network-mgt}/{{ cookiecutter.project_slug }}/ansible.cfg (100%) create mode 100644 network-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml create mode 100644 network-mgt/{{ cookiecutter.project_slug }}/hosts create mode 100644 network-mgt/{{ cookiecutter.project_slug }}/play.yml create mode 100644 network-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml delete mode 100644 network_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml delete mode 100644 network_mgt/{{ cookiecutter.project_slug }}/hosts delete mode 100644 network_mgt/{{ cookiecutter.project_slug }}/play.yml delete mode 100644 network_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml create mode 100644 proxmox-mgt/cookiecutter.json rename {server_mgt => proxmox-mgt}/{{ cookiecutter.project_slug }}/Makefile (100%) rename {server_mgt => proxmox-mgt}/{{ cookiecutter.project_slug }}/ansible.cfg (100%) create mode 100644 proxmox-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml create mode 100644 proxmox-mgt/{{ cookiecutter.project_slug }}/hosts create mode 100644 proxmox-mgt/{{ cookiecutter.project_slug }}/play.yml create mode 100644 proxmox-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml rename {server_mgt => server-mgt}/cookiecutter.json (100%) create mode 100644 server-mgt/{{ cookiecutter.project_slug }}/Makefile create mode 100644 server-mgt/{{ cookiecutter.project_slug }}/ansible.cfg create mode 100644 server-mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml create mode 100644 server-mgt/{{ cookiecutter.project_slug }}/hosts create mode 100644 server-mgt/{{ cookiecutter.project_slug }}/play.yml rename {server_mgt => server-mgt}/{{ cookiecutter.project_slug }}/roles/requirements.yml (77%) delete mode 100644 server_mgt/{{ cookiecutter.project_slug }}/group_vars/all.yml delete mode 100644 server_mgt/{{ cookiecutter.project_slug }}/hosts delete mode 100644 server_mgt/{{ cookiecutter.project_slug }}/play.yml 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 7f0182a..9e61221 100644 --- 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 - hosts: testgruppe medienraum + hosts: all 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 65284be..16a86fc 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -1,14 +1,24 @@ { "templates": { - "client_mgt": { - "path": "./client_mgt", + "client-mgt": { + "path": "./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", - "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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 0ccb88e..a51cd0f 100644 --- a/server_mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml +++ b/server-mgt/{{ cookiecutter.project_slug }}/roles/requirements.yml @@ -1,3 +1,3 @@ roles: - - name: fsit_cmgt + - name: fsit_smgt 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 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 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 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 -- 2.39.5