diff --git a/docker-compose/homer/assets/test.yml b/docker-compose/homer/assets/test.yml index 8e10ca1e..98be85a4 100644 --- a/docker-compose/homer/assets/test.yml +++ b/docker-compose/homer/assets/test.yml @@ -34,36 +34,3 @@ services: url: "https://pve2-test2.grote.lan:8006" target: "_blank" subtitle: "VM" - - name: "Apt-Cacher-NG" - logo: "assets/icons/acng.jpg" - url: "http://acng-test.grote.lan:9999/acng-report.html" - target: "_blank" - subtitle: "apt" - - name: "gitea" - logo: "assets/icons/gitea.png" - url: "http://gitea-test.grote.lan:3000" - target: "_blank" - subtitle: "git" - - - name: "Monitoring" - icon: "fas fa-cloud" - items: - - name: "Munin" - logo: "assets/icons/munin.png" - url: "http://docker7-test.grote.lan:12345" - target: "_blank" - subtitle: "Monitoring" - - - name: "Dienste" - icon: "fas fa-cloud" - items: - - name: "homer" - logo: "assets/icons/homer.png" - url: "http://docker7-test.grote.lan:333" - target: "_blank" - subtitle: "Dashboard" - - name: "DokuWiki" - logo: "assets/icons/dokuwiki.png" - url: "http://dokuwiki-test.grote.lan/doku.php" - target: "_blank" - subtitle: "Wiki" diff --git a/host_vars/docker7-test.grote.lan.yml b/host_vars/docker7-test.grote.lan.yml deleted file mode 100644 index 2222cb53..00000000 --- a/host_vars/docker7-test.grote.lan.yml +++ /dev/null @@ -1,95 +0,0 @@ ---- - ### mgrote.apt_manage_packages - apt_packages_extra: - - libwww-curl-perl # für munin-plugin: unifi - - libjson-perl # für munin-plugin: unifi - - sshpass # fur munin mt_system_* - ### mgrote.docker-compose-deploy - docker_compose_projects: - - name: watchtower - dir_name: docker-watchtower - repository_url: git.mgrote.net/mg/docker-watchtower - state: present - os_username: docker-user - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - - name: homer - dir_name: docker-homer - repository_url: git.mgrote.net/mg/docker-homer - state: present - os_username: docker-user - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - - name: munin-test - dir_name: docker-munin-test - repository_url: git.mgrote.net/mg/docker-munin-master_test - state: present - os_username: docker-user - repository_user: mg - repository_user_password: "{{ lookup('keepass', 'gitea_mg_https_password', 'password') }}" - ### oefenweb.ufw - ufw_rules: # ist extra weil bei munin kein subnet angegeben ist - - rule: allow - to_port: 22 - protocol: tcp - comment: 'ssh' - from_ip: 0.0.0.0/0 - - rule: allow - to_port: 4949 - protocol: tcp - comment: 'munin' - from_ip: 0.0.0.0/0 - ### geerlingguy.pip - pip_package: python3-pip - pip_install_packages: - - name: docker # für munin-plugin docker_ - ### mgrote.munin-node - munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift - munin_node_plugins: - - name: timesync - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/timesync_status - - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status - - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem - config: | - [systemd_mem] - env.all_services true - - name: lvm_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ - config: | - [lvm_*] - user root - - name: fail2ban - src: https://git.mgrote.net/mg/munin-plugins/raw/branch/master/extern/fail2ban - config: | - [fail2ban] - env.client /usr/bin/fail2ban-client - env.config_dir /etc/fail2ban - user root - - name: docker_containers - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ - config: | - [docker_*] - user root - env.DOCKER_HOST unix://run/docker.sock - - name: docker_cpu - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_memory - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_network - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ - - name: docker_volumes - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ - ### mgrote.docker-compose-inline - compose_owner: "docker-user" - compose_group: "docker-user" - compose_file_permissions: "644" - compose_dir_permissions: "755" - compose_dest_basedir: "/docker" - compose_src_basedir: "{{ inventory_dir }}/docker-compose" - compose_files: - - name: hastebin - state: present - - name: ara - state: present diff --git a/host_vars/fileserver2-test.grote.lan.yml b/host_vars/fileserver2-test.grote.lan.yml deleted file mode 100644 index 0eabc91d..00000000 --- a/host_vars/fileserver2-test.grote.lan.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- - ### mgrote.smb_fileserver - smb_shares: - - name: 'videos' - path: '/shares_videos' - users_ro: 'kodi' - users_rw: 'annemariedroessler2 michaelgrote win10' - - name: 'bilder' - path: '/shares_bilder' - users_ro: 'photoprism' - users_rw: 'annemariedroessler2 michaelgrote win10' - - name: 'proxmox' - path: '/shares_pve_backup' - users_ro: 'michaelgrote' - users_rw: 'pve win10' - - name: 'restic' - path: '/shares_restic' - users_ro: '' - users_rw: 'annemariedroessler2 restic win10 michaelgrote' - - name: 'vm' - path: '/shares_vm' - users_ro: '' - users_rw: 'michaelgrote' diff --git a/host_vars/pve2.grote.lan.yml b/host_vars/pve2.grote.lan.yml index b4b46c30..e7bc0d95 100644 --- a/host_vars/pve2.grote.lan.yml +++ b/host_vars/pve2.grote.lan.yml @@ -22,7 +22,7 @@ - dataset: rpool/vm state: present - dataset: rpool/vm/dir/fileserver2_test - state: present + state: absent # löschen - dataset: rpool/vm/dir state: present - dataset: rpool/vm/zvol @@ -139,16 +139,12 @@ ### mgrote.cv4pve-autosnap cv4pve_api_user: root@pam!cv4pve-autosnap cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token_pve2', 'password') }}" - cv4pve_vmid: all,-127,-112,-116,-105 + cv4pve_vmid: all,-127,-112,-116 cv4pve_keep_snapshots: 5 cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip" ### mgrote.proxmox_bind_mounts pve_bind_mounts: - - vmid: 105 - mp_nr: 1 - mp_path_host: /rpool/vm/dir/fileserver2_test - mp_path_guest: /share - vmid: 127 mp_nr: 0 mp_path_host: /hdd_data_raidz/videos diff --git a/inventory b/inventory index cfa07929..26a1c959 100644 --- a/inventory +++ b/inventory @@ -3,27 +3,21 @@ all: dokuwiki: hosts: dokuwiki2.grote.lan: - dokuwiki-test.grote.lan: fileserver: hosts: fileserver2.grote.lan: - fileserver2-test.grote.lan: dnsmasq: hosts: - dnsmasq-test.grote.lan: dnsmasq.grote.lan: acng: hosts: acng.grote.lan: - acng-test.grote.lan: ansible: hosts: ansible2.grote.lan: - ansible-test.grote.lan: docker: hosts: docker10.grote.lan: - docker7-test.grote.lan: vmtest: hosts: vm-test2.grote.lan: @@ -44,7 +38,6 @@ all: pve2.grote.lan: gitea: hosts: - gitea-test.grote.lan: gitea.grote.lan: production: @@ -59,13 +52,6 @@ all: docker10.grote.lan: test: hosts: - dokuwiki-test.grote.lan: - acng-test.grote.lan: - ansible-test.grote.lan: - docker7-test.grote.lan: vm-test2.grote.lan: pve2-test2.grote.lan: - gitea-test.grote.lan: - dnsmasq-test.grote.lan: - fileserver2-test.grote.lan: bastelstube-gui.grote.lan: