From f595ca6e49e975459604a10f991ff472f41d4bdf Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 2 Jun 2024 20:48:51 +0200 Subject: rename ch-apt to ch-repo --- inventory/group_vars/chaos-at-home/network.yml | 2 +- inventory/host_vars/ch-apt.yml | 104 ------------------------- inventory/host_vars/ch-repo.yml | 104 +++++++++++++++++++++++++ inventory/hosts.ini | 6 +- 4 files changed, 108 insertions(+), 108 deletions(-) delete mode 100644 inventory/host_vars/ch-apt.yml create mode 100644 inventory/host_vars/ch-repo.yml (limited to 'inventory') diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 099cd4d9..f8956a47 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -85,7 +85,7 @@ network_zones: - 195.58.161.122 offsets: ch-apps: 1 - ch-apt: 7 + ch-repo: 7 ch-http-proxy: 8 ch-imap-proxy: 9 ch-vpn: 10 diff --git a/inventory/host_vars/ch-apt.yml b/inventory/host_vars/ch-apt.yml deleted file mode 100644 index 2941c983..00000000 --- a/inventory/host_vars/ch-apt.yml +++ /dev/null @@ -1,104 +0,0 @@ ---- -install_jumphost: ch-jump - -install: - vm: - memory: 2G - numcpus: 2 - autostart: True - disks: - primary: /dev/sda - scsi: - sda: - type: zfs - name: root - size: 10g - sdb: - type: zfs - name: data - size: 20g - properties: - 'syncoid:sync': 'false' - interfaces: - - bridge: br-svc - name: svc0 - -network: - nameservers: "{{ network_zones.svc.dns }}" - domain: "{{ host_domain }}" - systemd_link: - interfaces: "{{ install.interfaces }}" - primary: &_network_primary_ - name: svc0 - address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.svc.gateway }}" - static_routes: - - destination: "{{ network_zones.lan.prefix }}" - gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" - interfaces: - - *_network_primary_ - - -apt_repo_provider: anexia - -spreadspace_apt_repo_components: - - prometheus - -ntp_variant: systemd-timesyncd - - -lvm_groups: - storage: - pvs: - - /dev/sdb - - -apt_cacher_ng_storage: - type: lvm - vg: storage - lv: apt-cacher-ng - size: 15G - fs: ext4 - -apt_cacher_ng_hostname: apt.chaos-at-home.org - -apt_cacher_ng_remaps: - debian: - path: /debian - backends: - - http://debian.anexia.at/debian - debian-security: - path: /debian-security - backends: - - http://debian.anexia.at/debian-security - debian-archive: - path: /debian-archive - backends: - - http://archive.debian.org/debian - ubuntu: - path: /ubuntu - backends: - - http://ubuntu.anexia.at/ubuntu - kali: - path: /kali - backends: - - http://http.kali.org/kali - raspios: - path: /raspios - backends: - - http://archive.raspberrypi.com/debian - -apt_cacher_ng_admin_auth: - username: admin - password: "{{ vault_apt_cacher_ng_admin_auth_password }}" - - - -prometheus_job_multitarget_blackbox__probe: - ch-mon: - - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" - module: ssh_banner - - instance: "http-apt.chaos-at-home.org" - target: "http://{{ apt_cacher_ng_hostname }}/acng-report.html" - module: "http_2xx" diff --git a/inventory/host_vars/ch-repo.yml b/inventory/host_vars/ch-repo.yml new file mode 100644 index 00000000..cbba6599 --- /dev/null +++ b/inventory/host_vars/ch-repo.yml @@ -0,0 +1,104 @@ +--- +install_jumphost: ch-jump + +install: + vm: + memory: 2G + numcpus: 2 + autostart: True + disks: + primary: /dev/sda + scsi: + sda: + type: zfs + name: root + size: 10g + sdb: + type: zfs + name: data + size: 50g + properties: + 'syncoid:sync': 'false' + interfaces: + - bridge: br-svc + name: svc0 + +network: + nameservers: "{{ network_zones.svc.dns }}" + domain: "{{ host_domain }}" + systemd_link: + interfaces: "{{ install.interfaces }}" + primary: &_network_primary_ + name: svc0 + address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.svc.gateway }}" + static_routes: + - destination: "{{ network_zones.lan.prefix }}" + gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" + interfaces: + - *_network_primary_ + + +apt_repo_provider: anexia + +spreadspace_apt_repo_components: + - prometheus + +ntp_variant: systemd-timesyncd + + +lvm_groups: + storage: + pvs: + - /dev/sdb + + +apt_cacher_ng_storage: + type: lvm + vg: storage + lv: apt-cacher-ng + size: 15G + fs: ext4 + +apt_cacher_ng_hostname: apt.chaos-at-home.org + +apt_cacher_ng_remaps: + debian: + path: /debian + backends: + - http://debian.anexia.at/debian + debian-security: + path: /debian-security + backends: + - http://debian.anexia.at/debian-security + debian-archive: + path: /debian-archive + backends: + - http://archive.debian.org/debian + ubuntu: + path: /ubuntu + backends: + - http://ubuntu.anexia.at/ubuntu + kali: + path: /kali + backends: + - http://http.kali.org/kali + raspios: + path: /raspios + backends: + - http://archive.raspberrypi.com/debian + +apt_cacher_ng_admin_auth: + username: admin + password: "{{ vault_apt_cacher_ng_admin_auth_password }}" + + + +prometheus_job_multitarget_blackbox__probe: + ch-mon: + - instance: "ssh-{{ inventory_hostname }}" + target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" + module: ssh_banner + - instance: "http-apt.chaos-at-home.org" + target: "http://{{ apt_cacher_ng_hostname }}/acng-report.html" + module: "http_2xx" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index b6e1fd32..2a0331a4 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -26,7 +26,7 @@ ch-equinox-t450s host_name=equinox-t450s ch-chromebook host_name=chromebook ch-prometheus host_name=prometheus ch-apps host_name=apps -ch-apt host_name=apt +ch-repo host_name=repo ch-http-proxy host_name=http-proxy ch-imap-proxy host_name=imap-proxy ch-prometheus-legacy host_name=prometheus @@ -379,7 +379,7 @@ vmhost-ch-phoebe-guests [vmhost-ch-prometheus-guests] ch-apps -ch-apt +ch-repo ch-http-proxy ch-imap-proxy ch-prometheus-legacy @@ -474,7 +474,7 @@ ch-iot ch-http-proxy ch-imap-proxy ch-greenbone -ch-apt +ch-repo [promzone-chaos-at-home:children] chaos-at-home-ap chaos-at-home-ups -- cgit v1.2.3