Merge branch 'fvs' of gitlab.steinbeisschule-reutlingen.de:L_MDT/debian-lan4fvs into fvs

2023-11-09 09:11:45 +01:00 · 2023-11-09 09:11:45 +01:00 · 50e88b0b65
commit 50e88b0b65
parent 0e4073336a b4769481fa
6 changed files with 174 additions and 153 deletions
--- a/inventory.yml
+++ b/inventory.yml
@ -1,152 +1,102 @@
---
-ungrouped:
-  hosts:
-
-proxmox:
-  hosts:
-    10.190.5.[51:54]:
-R202:
-  hosts:
-    10.190.7.[1:20]:
-    10.190.7.80:
-R216:
-  hosts:
-    10.190.8.[1:28]:
-    10.190.8.80:
-R217:
-  hosts:
-    10.190.6.[1:28]:
-    10.190.6.80:
-R314:
-  hosts:
-    10.190.9.[1:24]:
-    10.190.9.80:
-R317:
-  hosts:
-    10.190.10.[1:24]:
-    10.190.10.80:
-R319:
-  hosts:
-    10.190.5.[1:12]:
-    10.190.5.80:
-R406:
-  hosts:
-    10.190.11.[1:18]:
-    10.190.11.80:
-R407:
-  hosts:
-    10.190.12.[1:18]:
-    10.190.12.80:
-C051:
-  hosts:
-    10.190.22.[1:32]:
-    10.190.22.[80:81]:
-C055:
-  hosts:
-    10.190.24.[1:32]:
-    10.190.24.80:
-C061:
-  hosts:
-    10.190.20.[1:12]:
-    10.190.20.80:
-C062:
-  hosts:
-    10.190.21.[1:16]:
-    10.190.21.80:
-
-K200:
-  hosts:
-    10.190.99.41:
-    10.190.99.71:
-    10.190.99.81:
-    10.190.99.91:
-    10.190.99.101:
-    10.190.99.121:
-    10.190.99.141:
-K300:
-  hosts:
-    10.190.98.71:
-    10.190.98.81:
-    10.190.98.101:
-    10.190.98.111:
-    10.190.98.131:
-    10.190.98.161:
-K400:
-  hosts:
-    10.190.97.51:
-    10.190.97.91:
-    10.190.97.101:
-    10.190.97.111:
-    10.190.97.131:
-    10.190.97.141:
-    10.190.97.151:
-CK100:
-  hosts:
-    10.190.90.[152:159]:
-DK21:
-  hosts:
-    10.190.87.11:
-    10.190.87.21:
-    10.190.87.31:
-
-L200:
-  hosts:
-#    10.190.51.[1:10]:
-L300:
-  hosts:
-    10.190.52.[61:62]:
-    10.190.52.[91:92]:
-    10.190.52.121:
-    10.190.52.151:
-L400:
-  hosts:
-#    10.190.53.[1:10]:
-CL000:
-  hosts:
-    10.190.89.59:
-    10.190.89.60:
-CL100:
-  hosts:
-    10.190.62.[61:64]:
-W000:
-  hosts:
-    10.190.3.[1:3]:
-
-PCroom:
-  children:
-    R202:
-    R216:
-    R217:
-    R314:
-    R317:
-    R319:
-    R406:
-    R407:
-    C061:
-    C062:
-  vars:
-    boot_pxe: True
-Kroom:
-  children:
-    K200:
-    K300:
-    K400:
-    CK100:
-    DK21:
-Lroom:
-  children:
-    L200:
-    L300:
-    L400:
-    CL000:
-    CL100:
-desktop:
-  children:
-    PCroom:
-    Kroom:
-    Lroom:
-laptop:
-  children:
-    W000:
-    C052:
-    C055:
+$ANSIBLE_VAULT;1.1;AES256
+39333130303762616132633131366334623866666265643838613066333363383266306466343836
+3532633034666662386365313033616231346138346466350a643131613464353365663666383835
+30623162643332323437383963653235646163393636666639333531346535363737306231663631
+6137633139316562350a643565363962623035353537366638646637613533376466643035623135
+36666133313965346536643663336266353231373964343338343539303037323531303166613663
+35313434636661383030316161363461623331633033363061323938623435663265396436346536
+36623438363865623036653366663030326631613930313566346261346334663762383937633366
+66333066373431326461343365663030343661383564356531323838363866653532383863386639
+33363134323539646630336566653464363537373465343861303632323938653835613939613937
+61383932303031363030323465343737663430393836363564383539393263616437353933306361
+65373339613166616666636366363666656366316661346631663738623630366362316661396666
+36613636393733636634386265643837323264646537323330636533393634623436653761386633
+33363936326666666430646163636362643538386634656465353032316361343530363730383737
+38323163633436663032363565343766376166323165333531373330643138356636336133326439
+39623631616235343734653465616230313130336631653938663464386538363764303434613963
+33306333646462333964663237363765306238316564343132636430326439326362383564306236
+38333034383137623335626131653933643165643230346239346566343636656161646237646566
+38386431646333633763646431356437633237303261316265303832313832333230303634633261
+32323432333464373137346439343063393733383831323738643839303266653537356535346330
+38373135316463636434613764373062616137396332393538333163616137356538633234613332
+61343634353337343861636631376234666134373165303430663936613531373433653238663931
+65373839333165623965316664633532623234613764363535646435316330613366373236343634
+36636432616633336562646661393838353135613534303962303465636536376236616430383139
+34373038306539643063396631373237303534646463636437373964653536336435626133333639
+61663431363730663866626239386264633130666265396133353466383632636336363161343462
+35653632333565383163333537383464396332373230383864633739356534623136626336656637
+63643234666230393336323430646233393731366639303565343535613863343664623436636235
+66323236356435323639616235376266633638313562346564613463653537666137656134323734
+35613036636166393166393036326130393362333066373533623437363639613661623234343739
+30653632363564356664323961393538653166366230396563636438336535646562363230653064
+35326236356230323831383466353863353933636261333131366334623165336631323765346665
+36393063376666663661306637633538376239323633336235613534656462346463393136633833
+31383335386265656631363263303866303763666430343632663039316233633735613634306430
+61623132356331366462393530303165353764666637303134666635333639373666316164386161
+36323936313937396162303039303239363639336161646336653731393861653132616435343633
+65653466653035366234373535393130323736333865633534333864393137386633383739326161
+39386334353535643565376530303836386239643839396130333738373332303638323037653362
+37616638623731366262303965633531346561333439333931393832363733393537396234333035
+33373934613732396564366564656537316265613535316330346463666465376161653566656437
+39653730326331303033643064386235306636346533356433653461623462363563303934666634
+35323437396433646533626634343338306164316337393563346533383835343731643665306162
+33303438396239303038653033366262336339303063643137313930623464663236643738616437
+61353831633332303934323664396363636665633834306638343734343433383937396163323331
+66613063383032333236356261393937326165643636393661353464373130326630323931623439
+38313563333634383736393563303162623530356162663236376663646266313830353738353335
+39613965326331643866326365666561343161613235616431623634623636353534326431623032
+37383336383530333934323565383265356437346361363734353432626632333534363264303934
+38386135366336343939386334363532383761326438316139386230333436396536343439336366
+32663035313935323137366539333561636530633565353066633734313966303836613633613537
+37333266666361313261373434613830623435343734333962363762383463616463643561373264
+35623630623364623731616464343130626631346237336132643263306632653462373366396635
+34313835346534346439636464383431383861323137623466393334366133313732303962343166
+36353236343765323437613566646164626664373435343666623864353461653163333765333537
+63323631646263323465396234633234393362663531353935396236346165626234633933353537
+39363661386562313261363731313735353630386438636232316536336562616362646566613730
+33313063316665373638396464353936656636343735323664396131316338636239333337393737
+66653362653665613034376237663235316465396161623330396133323265653532323632616530
+33393138653533363632663261313364336563626333323034393632326333333464363432366264
+35343663303461366637363363646262626366303461373237366431353632306131326133313933
+33656434653737306265643738303966393939396264356136623466643837376466613464633634
+65623263616438393630363539376534353332623439333939303438653136656132386433353230
+64623134383439303735383934386435636138373966646138346235366434636464383136336163
+34333535373338313336303665343636383334343638383334616631333735373434643063636565
+33353933303932373834313762393763303161646237656236333863623836363332326566666263
+31396563623438616532333962333865323862373731396163623338313938313536663332343463
+63323130336635646338306634313932653133386131613533303332326437343536383863663634
+63313763333064396266653131666131666636656262343262653932643735663537303838366639
+33633137366136386636636631376337656130623563653030356636383362363965383139383436
+32626337623161333464313134643331636261323462623863653431623431663131633261366436
+32366633336331363661393831376630653330666635643635303830656361376639393939353935
+36316237376638306532666536656361383434346365623964626335626633336633323166636435
+38626466303039663831646266663865653432333030393861326430353035346632653063646332
+65643038633464633836343530336166323735373736333965356238316635333831616135316361
+66343037663664646533323234616363643239356631346533303334363534663538633266336462
+62346263633131323061343035366365323763613337323036643366353938666331626230373138
+61393936633334343863373531356131303732656365363562633937366462356365343636663933
+32396436373731346366316266353334663239323561363461623835626461383135303263666639
+31623237373961366438386332633235323362633462343639613433323964316532343339373432
+33393064613937363964653465383330363736373461643464343536303934353264393832623634
+33613662663266323131303837303466666335646136653566333537636238376361383836363239
+66303932626337383165653236663262373236643862666634666336666432393761346539636139
+36623938623366393165376630326264356630653238663937323563303230613438386461313332
+33393534353863366234353033303239363833396332356464353466656639623163313962313965
+37666537356539346531613866376562623632373965363836366565326465343631353964303239
+30333934323565366233326330666563306535333337616333636163313739633161613039316434
+63376234666434363737343366666336663839363562376536383937633764666361363532393963
+37663436306538323232653238303334636331643734393230383463393938323536653265393832
+33396439646464386566333136663263343263306630623234613730356139313534333561626230
+37323031383163333035333264323563343835393361376564666232336632623266363535653533
+36333030363934363137343832643864306532643839643031383963656436326233396261386663
+39343563373965613031363131623363303438373435363735353066366330333264363836343163
+37613739613336323932343135356638326531616237383936333832393834613866333937316232
+34623335373835353662363063316133623963386337303733636432386664313865326634653436
+64333439306437386338616533306465366365623434613537303737626564306561393331663233
+34363164386638316633366161333539383337386666346462363334323166313162636633613535
+37333639363266323632386463656662333139346430666336393933343931633666313966653038
+63633566363730323466623066303733663865623964666164383162356531343436353039303638
+62393961383132323363313437613637383637363263646130653230353164633237343136393436
+34616539353231396438373130613433353463343164383238396233336532343961663564366631
+38646266393637353334623463313939623164396561616133633632393963653232616338643039
+64666266393238353335376338643165323236646231346131396533626665346131
--- a/lmn-client.yml
+++ b/lmn-client.yml
@ -193,5 +193,6 @@
    localuser: "{{ vault_localuser }}"
    localuser_pwd: "{{ vault_localuser_pwd }}"
  roles:
-    - lmn_wlan
+    - role: lmn_wlan_iwd
+      when: ansible_interfaces | select('search', 'wl.+') | first is defined
    - lmn_localuser
--- a/roles/lmn_fvs/tasks/main.yml
+++ b/roles/lmn_fvs/tasks/main.yml
@ -31,11 +31,14 @@
      - git
      - gitg
      - gitk
+      - htop
      - jupyter
      - kdevelop
      - kdevelop-php
      - kdevelop-python
+      - krita
      - libnotify-bin ## needed for pwroff script
+      - links2
      - minder
      - neovim
      - net-tools
@ -44,12 +47,14 @@
      - php-cli
      - planner
      - pulseview
+      - python3-websockets
      - sigrok
      - sigrok-cli
      - tmux
      - tree
      - ttf-mscorefonts-installer
      - unison-gtk
+      - w3m
      - wireshark
      - zulucrypt-gui
    autoremove: true
@ -81,6 +86,11 @@
    src: policies.json
    dest: /etc/firefox-esr/policies/

+- name: Update all packages unattended
+  ansible.builtin.replace:
+    path: /etc/apt/apt.conf.d/50unattended-upgrades
+    regexp: '^//(\s+"origin=.+-updates";)$'
+    replace: '  \1'

 - name: Copy pwroff and bootorder scripts
  copy:
--- a/roles/lmn_wlan_iwd/tasks/main.yml
+++ b/roles/lmn_wlan_iwd/tasks/main.yml
@ -0,0 +1,60 @@
+## Make sure to use an initrd providing firmware:
+##   wget https://cdimage.debian.org/cdimage/firmware/testing/current/firmware.cpio.gz
+##   cat initrd.gz firmware.cpio.gz > initrd-fw.gz
+---
+- name: Install iwd
+  ansible.builtin.apt:
+    name:
+      - iwd
+      - systemd-resolved
+    state: latest
+
+- name: Disable wpa-supplicant
+  ansible.builtin.systemd:
+    name: wpa_supplicant.service
+    state: stopped
+    enabled: False
+
+- name: Enable iwd
+  ansible.builtin.systemd:
+    name: iwd.service
+    state: started
+    enabled: True
+
+- name: Prepare directory for iwd
+  file:
+    path: /var/lib/iwd/
+    state: directory
+
+- name: Configure iwd for wifi device
+  ansible.builtin.copy:
+    dest: /var/lib/iwd/{{ ssid }}.psk
+    content: |
+      [Security]
+      Passphrase={{ wifipasswd }}
+
+- name: Use iwd but ignore wlan interfaces in NetworkManager
+  blockinfile:
+    dest: /etc/NetworkManager/NetworkManager.conf
+    block: |
+      [device]
+      wifi.backend=iwd
+      match-device=interface-name:wl*
+      managed=0
+
+- name: Configure systemd-networkd
+  ansible.builtin.copy:
+    dest: /etc/systemd/network/wlan-dhcp.network
+    content: |
+      [Match]
+      Name=wl*
+      [Network]
+      DHCP=yes
+      [DHCPv4]
+      UseDomains=true
+
+- name: Enable systemd-networkd
+  ansible.builtin.systemd:
+    name: systemd-networkd.service
+    state: started
+    enabled: True
--- a/roles/lmn_wlan_nm/tasks/main.yml
+++ b/roles/lmn_wlan_nm/tasks/main.yml
--- a/roles/lmn_wlan_nm/templates/ssid.nmconnection.j2
+++ b/roles/lmn_wlan_nm/templates/ssid.nmconnection.j2