feat: add dns_dhcp for vyos

zwischenstand
feat: set correct vyos password for rosseau
2024-01-20 17:21:45 +01:00 · 2024-01-19 19:20:52 +01:00 · 2024-01-19 17:57:17 +01:00 · 2024-01-19 17:11:21 +01:00
16 changed files with 194 additions and 71 deletions
--- a/files/platon/reboot.sh
+++ b/files/platon/reboot.sh
@ -1,13 +1,11 @@
 #!/bin/sh
 PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/games:/usr/games'
-echo 'set PCM volume'
-sudo amixer set "PCM" "70%"
 echo 'start i2c-foo'
 sudo modprobe i2c_dev
 sudo modprobe i2c_bcm2708
 echo 'starting log'
 tmux new-session -s status -d 'sudo less /var/log/shuttercontrol.log'
-cd /home/pi/netz39_rollladensteuerung/raspberry/shuttercontrol
+cd /home/pi/netz39_rollladensteuerung/raspberry/shuttercontrol 
 echo 'switch-on.sh'
 ../switch-on.sh
 cd /home/pi
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@ -61,16 +61,6 @@ users:
    ssh_pub:
      - !unsafe >
        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILKhKHCPibswu2p6UQHKsBSqGaXzMFM+oMX0XEWsxCIc timo@Space-Lap
-      - !unsafe >
-        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMJoS7nsLLzSAsZA4us2/7JaQhgRjj/BY+LOpDQnfy8u timo@mac
-    sudo: yes
-    docker: yes
-  - logname: "JensWH"
-    viewname: "Jens Winter-Hübenthal"
-    email: "jens.winter@gmail.com"
-    ssh_pub:
-      - !unsafe >
-        ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIII4FS2sROKs2nIW8uzDuWmj8q127UoljtkVMthY8g// jens@work-lenovo
    sudo: yes
    docker: yes

--- a/host-krypton.yml
+++ b/host-krypton.yml
@ -116,7 +116,7 @@
    - name: Ensure container for entities validation service is running
      docker_container:
        name: entities_validation_svc
-        image: netz39/entities_validation_svc:v1.0.1
+        image: netz39/entities_validation_svc:v1.0.0
        pull: true
        state: started
        detach: yes
--- a/host-pottwal.yml
+++ b/host-pottwal.yml
@ -117,7 +117,7 @@
    - name: Ensure shlink database container is running
      docker_container:
        name: shlinkdb
-        image: postgres:16.3-alpine
+        image: postgres:16.1-alpine
        pull: true
        state: started
        restart_policy: unless-stopped
@ -147,6 +147,7 @@
        env:
          TZ: "{{ timezone }}"
          DEFAULT_DOMAIN: "{{ shlink_domain_name }}"
+          GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}"
          INITIAL_API_KEY: "{{ shlink_initial_api_key }}"
          DB_DRIVER: "postgres"
          DB_HOST: shlinkdb
@ -269,8 +270,6 @@
          - "127.0.0.1:{{ jabber_host_port }}:80"
        volumes:
          - "{{ prosody_data_dir }}/var/www:/public:ro"
-      tags:
-        - prosody-web

    - name: Setup proxy site {{ prosody_domain_name }}
      # point to static website for now
@ -279,8 +278,6 @@
      vars:
        site_name: "{{ prosody_domain_name }}"
        proxy_port: "{{ jabber_host_port }}"
-      tags:
-        - prosody-web

    - name: Check if hedgedoc data dir exists
      ansible.builtin.stat:
@ -454,7 +451,6 @@
          MYSQL_DATABASE: "{{ redmine_database }}"
        volumes:
          - "{{ data_dir }}/redmine/mysql:/var/lib/mysql"
-          - "{{ data_dir }}/redmine/mysql-config:/etc/mysql/conf.d"
        networks:
          - name: redminenet
      tags:
--- a/host-radon.yml
+++ b/host-radon.yml
@ -13,7 +13,7 @@
    nodered_image: nodered/node-red:3.0.1-1-18
    nodered_data: "{{ data_dir }}/nodered"

-    rabbitmq_image: bitnami/rabbitmq:3.13.6
+    rabbitmq_image: bitnami/rabbitmq:3.12.12
    rabbitmq_data: "{{ data_dir }}/rabbitmq"

    pwr_meter_pulse_gw_image: netz39/power-meter-pulse-gateway:0.3.0
@ -187,7 +187,7 @@
    - name: Setup docker container for BrotherQL Web UI printer
      docker_container:
        name: brotherql-web
-        image: dersimn/brother_ql_web:2.1.9-alpine
+        image: dersimn/brother_ql_web:2.1.7-alpine
        pull: true
        restart_policy: unless-stopped
        state: started
@ -212,7 +212,7 @@
    - name: Setup docker container for Grafana Screenshots
      docker_container:
        name: grafana-screenshot
-        image: mrtux/grafana-screenshot:0.1.1
+        image: mrtux/grafana-screenshot:0.1.0
        pull: true
        restart_policy: unless-stopped
        detach: yes
--- a/host-tau.yml
+++ b/host-tau.yml
@ -14,7 +14,7 @@
    dokuwiki_port: 9005
    # This container is pinned, because there are issues
    # with backwards compatibility within the same tag!
-    dokuwiki_image: bitnami/dokuwiki:20240206.1.0
+    dokuwiki_image: bitnami/dokuwiki:20230404@sha256:37e5b6e946851fc1fbd0f37a11e4521fdaca7da698d461da5207168c7364c142

    discord_invite_domain: discord.netz39.de

--- a/host-unicorn.yml
+++ b/host-unicorn.yml
@ -13,7 +13,7 @@
    - name: Setup the docker container for unifi-controller
      docker_container:
        name: unifi-controller
-        image: jacobalberty/unifi:v8.1.113
+        image: jacobalberty/unifi:v8.0.26
        state: started
        restart_policy: unless-stopped
        container_default_behavior: no_defaults
--- a/host-vyos.yml
+++ b/host-vyos.yml
@ -0,0 +1,78 @@
+---
+- hosts: vyos.n39.eu
+  become: true
+
+  vars:
+    ansible_python_interpreter: /usr/bin/python3
+
+  roles:
+
+  tasks:
+
+    - name: Configure a DHCP Server
+      vyos.vyos.vyos_config:
+        lines:
+          - set system option keyboard-layout 'de' 
+
+    - name: Replace provided configuration with device configuration
+      vyos.vyos.vyos_interfaces:
+        config:
+        - name: eth0
+          description: Trunk
+          vifs:
+          - vlan_id: 1
+            description: VIF 1 - mgmt
+          - vlan_id: 4
+            description: VIF 4 - user
+          - vlan_id: 7
+            description: VIF 7 - telekom pppoe
+          - vlan_id: 9
+            description: VIF 9 - dmz
+          - vlan_id: 71
+            description: VIF 71 - telekom status
+          - vlan_id: 100
+            description: VIF 100 - RAW Internet
+        state: replaced
+
+    - name: Merge provided configuration with device configuration
+      vyos.vyos.vyos_l3_interfaces:
+        config:
+        - name: eth0.1
+          ipv4:
+          - address: 172.23.63.2/24
+        - name: eth0.4
+          ipv4:
+          - address: 172.23.48.4/22
+        - name: eth0.9
+          ipv4:
+          - address: 172.23.52.2/22
+        - name: eth0.71
+          ipv4:
+          - address: 192.168.100.3/24
+        - name: eth0.100
+          ipv4:
+          - address: 192.168.39.1/24
+      state: replaced
+
+    - name: Configure a DHCP Server
+      vyos.vyos.vyos_config:
+        lines:
+          - set service dhcp-server disabled 'false'
+          - set service dhcp-server shared-network-name Client subnet 172.23.63.0/24 default-router '172.23.63.2'
+          - set service dhcp-server shared-network-name Client subnet 172.23.48.0/22 default-router '172.23.48.4' start '172.23.48.150' stop '172.23.51.250'
+          - set service dhcp-server shared-network-name Client subnet 172.23.52.0/22 default-router '172.23.52.2' start '172.23.53.0' stop '172.23.53.255'
+          - set service dhcp-server shared-network-name Client subnet 192.168.39.0/24 default-router '192.168.39.1'
+        save: yes
+  
+    - name: And a DNS forwarder
+      vyos.vyos.vyos_config:
+        lines:
+          - set system static-host-mapping host-name ipv6.host.domain.loc inet xxxx:xxxx:xxxx:xxxx::x
+          - set system static-host-mapping host-name ipv6.host.domain.loc alias host.domain.loc
+        save: yes
+
+  handlers:
+    - name: restart
+      vyos.vyos.command:
+        commands:
+          - restart
--- a/host_vars/pottwal.n39.eu/vars.yml
+++ b/host_vars/pottwal.n39.eu/vars.yml
@ -12,24 +12,25 @@ cleanuri_amqp_vhost: "/cleanuri"
 forgejo_host_port: 9091
 forgejo_ssh_port: 2222
 forgejo_domain_name: git.n39.eu
-forgejo_image: codeberg.org/forgejo/forgejo:1.21.11-0
+forgejo_image: codeberg.org/forgejo/forgejo:1.21.4-0

 shlink_host_port: 8083
 shlink_domain_name: sl.n39.eu
-shlink_image: shlinkio/shlink:4.1.1
+shlink_image: shlinkio/shlink:3.7.3
+shlink_geolite_license_key: "{{ vault_shlink_geolite_license_key }}"
 shlink_initial_api_key: "{{ vault_shlink_initial_api_key }}"
 shlink_postgres_password: "{{ vault_shlink_postgres_password }}"

 hedgedoc_host_port: 8084
 hedgedoc_domain_name: pad.n39.eu
 hedgedoc_image: quay.io/hedgedoc/hedgedoc:1.9.9
-hedgedoc_db_image: postgres:16.3-alpine
+hedgedoc_db_image: postgres:16.1-alpine
 hedgedoc_postgres_password: "{{ vault_hedgedoc_postgres_password }}"

 redmine_host_port: 8087
 redmine_domain_name: redmine.n39.eu
-redmine_image: redmine:5.1.3
-redmine_mysql_image: mysql:8.4
+redmine_image: redmine:5.1.1
+redmine_mysql_image: mysql:8.3
 redmine_database: redmine
 redmine_database_password: "{{ vault_redmine_database_password }}"

@ -42,24 +43,24 @@ influxdb_init_password: "{{ vault_influxdb_init_password }}"
 jabber_host_port: 8086
 prosody_domain_name: jabber.n39.eu
 prosody_image: netz39/prosody:0.11
-prosody_web_image: joseluisq/static-web-server:2.32
+prosody_web_image: joseluisq/static-web-server:2.24
 prosody_config_dir: "/etc/prosody"
 prosody_data_dir: "{{ data_dir }}/prosody"

 uptimekuma_host_port: 8085
 uptimekuma_domain_name: uptime.n39.eu
-uptimekuma_image: louislam/uptime-kuma:1.23.13
+uptimekuma_image: louislam/uptime-kuma:1.23.11

 grafana_host_port: 8089
 grafana_domain_name: grafana.n39.eu
-grafana_image: grafana/grafana:10.4.5
+grafana_image: grafana/grafana:10.2.3
 grafana_admin_password: "{{ vault_grafana_admin_password }}"

 homebox_host_port: 8092
 homebox_domain_name: inventory.n39.eu
 homebox_image: ghcr.io/hay-kot/homebox:v0.10.3

-renovate_image: renovate/renovate:38.17.1
+renovate_image: renovate/renovate:37.107.0
 renovate_forgejo_pat: "{{ vault_renovate_forgejo_pat }}"
 renovate_github_pat: "{{ vault_renovate_github_pat }}"
-renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
+renovate_git_user: "Renovate Bot <accounts+renovatebot@netz39.de>"
--- a/host_vars/pottwal.n39.eu/vault
+++ b/host_vars/pottwal.n39.eu/vault
@ -1,33 +1,35 @@
 $ANSIBLE_VAULT;1.1;AES256
-61323135656430613464613334653239613865623361363734306139383261653563373365306364
-3232353634356664323235393135653762383538353635660a363461393133376566613064366233
-32323065633164646535386461373261373461343961383333333063663831353961656265313836
-6231356666356266390a333230376264313537376461326331313134313737616137636465336430
-38616261333534393464343630616464326331653163616435613863616165633730353263656565
-66346536393737353962666438333661663636636339613633653363323438326635643738656430
-38313635323066376532396666653633393736633939306566333337336635386430373662666534
-64653662333832313964323039353838353638313337306631613564383933663166633164373132
-33326537366135613733386436663366613238636133343065376534323561656265613433336637
-64613330306530323238663738356133663166303730633735656562636139626232396130656337
-34323238326437303730643736646430646239383239613061333033343733663832656262383732
-66343236326537633539353230376365666462393264303532346431383838303963613731343263
-63656630623934643763636237366630386333646263336261386162656439323232653066393266
-36633239323638396639623734666466343164663539316165386632306235363435303139356433
-37633731366565393339326235616264616535363461653531613331356239666534653232376235
-36623431343136633964656330313833643161353738303564663662363062653631363661633333
-31663339643034333336313630356266393062323637333664646335363961386433303662343734
-32313338613064373966393163623863633037353564316361656162323234313435646532343231
-30356336626435306332316566323932313564626164316165646530656365363330643033376134
-32363530306536633531326535373136326364356237376264646130663430343838323834386264
-35306561353866346430393837346333396236356465666334656139373764653365396534613034
-36393239623930656266336130303236393336373063623738653939393563336130316461393535
-32313932396263306439356663373361393539633639343238393631343830306532336162616565
-32336264646333613238363065613130633966656164666333303332313536616334623639613630
-34323665366131663736623638636263616131393133346464653037366465633332363131316332
-65356563373036353432376234626262313266316435656562646365363539386361653966366465
-39383536313764663732613462383466616238363765633062333830373038656334363764643663
-61346664353064333238313038303333386436653738316630383237366532353765346633383862
-65666235666663666638656337303762626563663135613431616439633731383638653466623434
-62663164633032666638656464666130623566356636343330386236336266386263323936396330
-31613339623034663466613930613062343666633530306136623734393862333365646538326261
-63646439343565366463
+33383365663237393662386363396661323463396239653830396164316538323362376337326233
+3730346439376362396261333165616536616135366637660a323435346262353061323130303362
+66656533633333346536653638303463386334306461313830383631323331343332376435636631
+6662323136306538370a616563376364373737396134616161356134636663613262366234306530
+36396635383933393034613863386338613266333834616666393939393261613235366132663866
+65356162633934633066336532396662356163386335313833386230643165633464663065383131
+32366534366335623136363738653066336339623832636166343239613535623333343035633662
+39663638386364306361643861666530323730626265633865343534643564363961636463356431
+34333463383137363064323634656561313464303266653138383038303964363263326165643130
+63613162383030323263613964303932623339626139326161393439663763386462313562636330
+65323762356135333736316564623565316533646132303265623364386263383733306136326237
+36353638663936666633393332623436643436333164633566386130396638633637323538633033
+37326663636139646236636164353066626136396566633363333236313266656139646563386234
+66633735396532613838646561643563623538363264383763303363313266363134353232643666
+33333531386238356232306164346331353366636565656463323134333362353764663437663330
+63363065353430353861316134656533363533666335373163303661656134646237386664636564
+33643836386331363461383934666335336533353331363735346566323139646362343765383766
+38306462313033353831626439626235393036393765306139313161353163636233616139396430
+65373236336562343939356266333037643838363333396462336331303366333362393462313233
+61343632646431616461343861626437623362343762393265323461343263396338373434623065
+63316438323732326531316534613531366464623435623163663830343962343532353136366338
+36646663363763633432376632353164366463336166356465333238383637623633663039343938
+31613662666336316137376338393131393331653331663465373266313164303962363932656430
+63623733313362323166356435346634333431306431393633346430336461663965643362643634
+37666635633937323635373837333034653835363939623938306462366234343130386430303965
+39323563343033343137363065396134366434383637363661323538343135323336333962646131
+36356436396431646566613133336263653466633237373839626361393738383865313238363535
+66623031623562386634366238383632326238636231626637633436326336633335626433653363
+36626237333962653863613932376230396535303834323030353239623161653734303966633930
+38653338636431383730376262386630613062366231366239616233616439386531313338343166
+38656138303363643933633864616366343039626237616633643961346338623737313266633537
+36623731323639643530363766323530616462366264613265303861663863306461393834393565
+38656535353138306264386433323337343661326435316632323838303639353830613832613461
+6461613532393237393866613765396530633561663838613461
--- a/host_vars/vyos.n39.eu/dns-dhcp.yml
+++ b/host_vars/vyos.n39.eu/dns-dhcp.yml
@ -0,0 +1,44 @@
+entries:
+- hostname: sw-1
+  mac: 00:0f:cb:ed:5e:e0
+  address: 172.23.63.34
+  # aliases:
+  # - name: 
+- hostname: sw-4
+  mac: 00:1e:8c:74:79:62
+  address: 172.23.63.35
+  aliases:
+  - name: gx-2124x.n39.eu
+- hostname: beaker-mgmt
+  mac: 00:19:99:ec:07:5d
+  address: 172.23.63.43
+- hostname: sw-2.n39.eu
+  mac: 10:0d:7f:4a:c0:21
+  address: 172.23.63.94
+  aliases:
+  - name: gs108tv2-1.n39.eu
+- hostname: sw-3.n39.eu
+  mac: 20:0c:c8:4e:2c:56
+  address: 172.23.63.104
+  aliases:
+  - name: gs105pe-1.n39.eu
+- hostname: pottwal.n39.eu
+  mac: 52:82:de:fc:1e:94
+  address: 172.23.52.44
+  aliases:
+  - name: apt-proxy.n39.eu
+  - name: label.n39.eu
+  - name: syslog.n39.eu
+  - name: pad.n39.eu
+  - name: git.n39.eu
+  - name: uritools.n39.eu
+  - name: uritools-api.n39.eu
+  - name: uptime.n39.eu
+  - name: redmine.n39.eu
+  - name: influx.n39.eu
+  - name: jabber.n39.eu
+  - name: conference.jabber.n39.eu
+  - name: grafana.n39.eu
+  - name: inventory.n39.eu
+  - name: sl.n39.eu
+  - name: spaceapi.n39.eu
--- a/host_vars/vyos.n39.eu/vars.yml
+++ b/host_vars/vyos.n39.eu/vars.yml
@ -0,0 +1,6 @@
+---
+ansible_user: vyos
+ansible_connection: ansible.netcommon.network_cli
+ansible_network_os: vyos
+vyos_user: "vyos"
+vyos_password: "${{ vault_vyos_password }}"
--- a/host_vars/vyos.n39.eu/vault
+++ b/host_vars/vyos.n39.eu/vault
@ -0,0 +1,6 @@
+$ANSIBLE_VAULT;1.1;AES256
+61653838316339323134626339363035316239326637346534623263343732393865396538323063
+6538373236396131653532633134333035376666383262640a343961313831326634393166653539
+36376634353437346230323037656364636235336530396661653739626432373938646634663065
+6466363965396130650a376339356330313763383936326662663361366535306463333934356238
+37623336363637383233323966386231333437343435386462323532366461663364
--- a/inventory.yml
+++ b/inventory.yml
@ -18,6 +18,7 @@ all:
    k3s-w1.n39.eu:
    k3s-w2.n39.eu:
    k3s-w3.n39.eu:
+    # vyos.n39.eu:

  children:
    docker_host:
@ -61,6 +62,7 @@ all:
        k3s-w1.n39.eu:
        k3s-w2.n39.eu:
        k3s-w3.n39.eu:
+        rousseau.n39.eu:
    location_internet:
      hosts:
        tau.netz39.de:
--- a/requirements.yml
+++ b/requirements.yml
@ -15,4 +15,4 @@ roles:

 collections:
  - name: community.grafana
-    version: 1.9.1
+    version: 1.6.1
--- a/roles/cleanuri/defaults/main.yml
+++ b/roles/cleanuri/defaults/main.yml
@ -19,7 +19,7 @@ cleanuri_amqp_canonizer: "canonizer"
 cleanuri_amqp_retrieval: "extractor"

 # Docker images
-cleanuri_image_webui: mrtux/cleanuri-webui:0.2.1
+cleanuri_image_webui: mrtux/cleanuri-webui:0.2.0
 cleanuri_image_apigateway: mrtux/cleanuri-apigateway:0.3.1
-cleanuri_image_canonizer: mrtux/cleanuri-canonizer:0.5.0
-cleanuri_image_extractor: mrtux/cleanuri-extractor:0.5.0
+cleanuri_image_canonizer: mrtux/cleanuri-canonizer:0.4.0
+cleanuri_image_extractor: mrtux/cleanuri-extractor:0.4.0
Author	SHA1	Message	Date
David Kilias	a12729ba3b	feat: add dns_dhcp for vyos	2024-01-20 17:21:45 +01:00
David Kilias	45ffd0e23c	zwischenstand	2024-01-19 19:20:52 +01:00
David Kilias	5432c8b2b5	feat: set correct vyos password for rosseau	2024-01-19 17:57:17 +01:00
David Kilias	77cc80f798	feat: add vyos credentials for rousseau	2024-01-19 17:11:21 +01:00