tursas: update and test

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author

1 files changed, 115 insertions, 150 deletions

diff --git a/ansible/tursas.yml b/ansible/tursas.yml
index 6b62d34..f8066fa 100644
--- a/ansible/tursas.yml
+++ b/ansible/tursas.yml
@@ -12,171 +12,135 @@
     - role: gnome-system
     - role: mail-client
     - role: unix_users
-#     # - role: rust-rustup
+    - role: rust-rustup
 
   tasks:
-    # Remove ping to force it be reinstalled so that the right
-    # capabilities are set.
-    - apt:
+    - name: "remove ping so it can be re-installed with capabilities"
+      apt:
         name: iputils-ping
         state: absent
 
-    - apt:
+    - name: "install additional software"
+      apt:
         name:
-          # - ambient-driver
-          # - asciidoctor
+          - acpi
+          - ambient-driver
+          - ansible
+          - apt-file
+          - asciidoctor
+          - bc
+          - bind9-host
+          - cachedir
+          - clab
+          - curl
+          - daemonize
+          - dict
+          - dict-foldoc
+          - dict-gcide
+          - dict-jargon
+          - dict-vera
+          - dict-wn
+          - dictd
+          - dnsutils
+          - emacs
+          - fio
+          - gddrescue
+          - genisoimage
+          - git-annex
+          - graphviz
+          - iftop
+          - ikiwiki
+          - info
+          - iputils-ping
+          - jq
+          - jt
+          - libdvd-pkg
+          - librsvg2-bin
+          - liw-automation
+          - locales-all
+          - lshw
+          - moreutils
+          - nfs-common
+          - nmap
+          - num-utils
+          - oathtool
+          - obnam
+#          - obnam-benchmark
+#          - openpgp-ca
+          - ovmf
+          - pandoc
+          - pandoc-filter-diagram
+          - pass
+          - pathdedup
+          - pavucontrol
+          - plantuml
+          - printer-driver-ptouch
+          - psmisc
+          - pv
+          - qemu-user-static
+          - radicle
+          - shellcheck
+          - sqlite3
+          - sshca
+          - strace
+          - subplot
+          - summain
+          - texlive-fonts-recommended
+          - texlive-latex-extra
+          - texlive-latex-recommended
+          - texlive-plain-generic
+          - time
+          - units
+          - usbutils
+          - uuid
+          - validns
+          - vim
+          - vlc
+          - vmdb2
+          - vobcopy
+          - w3m
+          - whois
+          - xpdf
+          - yaml-mode
+          - zerofree
+          - zip
+          - zoxide
+
           # - black
-          # - btrfs-progs
-          # - build-essential
-          # - cachedir
-          # - capnproto
-          # - clab
-          # - clang
-          # - daemonize
-          # - debhelper
           # - expect
-          # - extrautils
-          - fio
-          # - firmware-misc-nonfree
-          # - fling
-          # - gddrescue
-          # - genisoimage
           # - gimp
-          # - graphviz
           # - inkscape
-          # - iputils-ping
-          # - jq
-          # - jt
-          # - libclang-dev
-          # - libdvd-pkg
-          # - librsvg2-bin
-          # - libsqlite3-dev
-          # - libssl-dev
-          # - libvirt-dev
           # - linux-perf
-          # - liw-automation
-          # - llvm
-          # - lmodern
-          # - nettle-dev
-          # - nfs-common
-          # - obnam
-          # - obnam-benchmark
-          # - openpgp-ca
-          # - ovmf
-          # - pandoc
-          # - pandoc-filter-diagram
-          # - pathdedup
-          # - pavucontrol
-          # - pkg-config
-          # - plantuml
-          # - printer-driver-ptouch
-          # - python3
           # - python3-requests
-          # - qemu-user-static
-          # - radicle
-          # - sequoia-chameleon-gnupg
-          # - shellcheck
-          # - sq-liw
-          # - sqlite3
-          # - sshca
-          # - subplot
-          # - summain
-          # - texlive-fonts-recommended
-          # - texlive-latex-base
-          # - texlive-latex-extra
-          # - texlive-latex-recommended
-          # - texlive-plain-generic
           # - unicode
-          # - usbutils
-          # - uuid
-          # - validns
-          # - vlc
-          # - vobcopy
-          # - vmdb2
-          # - xpdf
-          # - zerofree
-
-    - name: install command line utilities
-      apt:
-        name:
-        - acpi
-        # - ambient-run
-        # - apt-file
-        # - bc
-        # - bind9-host
-        # - cryptsetup
-        # - curl
-        # - debmirror
-        # - dict
-        # - dict-foldoc
-        # - dict-gcide
-        # - dict-jargon
-        # - dict-vera
-        # - dict-wn
-        # - dictd
-        # - dnsutils
-        # - git-annex
-        # - htop
-        # - iftop
-        # - ikiwiki
-        # - info
-        # - jt
-        # - locales-all
-        # - lshw
-        # - lvm2
         # - mmv
-        # - moreutils
-        # - mosh
         # - mtr
         # - nethogs
-        # - nmap
-        # - num-utils
-        # - oathtool
         # - parted-doc
-        # - psmisc
-        # - pv
-        # - rsync
-        # - screen
-        # - strace
-        # - time
-        # - tmux
-        # - units
-        # - vim
-        # - w3m
-        # - whois
-        # - yaml-mode
-        # - zip
-        # - yaml-mode
-        # - zip
-        # - zoxide
 
-    # - name: configure dict
-    #   copy:
-    #     content: |
-    #       server localhost
-    #     dest: /etc/dictd/dict.conf
+    - name: configure dict
+      copy:
+        content: |
+          server localhost
+        dest: /etc/dictd/dict.conf
 
-    # - lineinfile:
-    #     path: /etc/gdm3/daemon.conf
-    #     regexp: WaylandEnable=
-    #     line: "# WaylandEnable=false"
+    - lineinfile:
+        path: /etc/default/grub
+        regexp: GRUB_ENABLE_CRYPTODISK
+        line: "GRUB_ENABLE_CRYPTODISK=n"
 
-    # - lineinfile:
-    #     path: /etc/default/grub
-    #     regexp: GRUB_ENABLE_CRYPTODISK
-    #     line: "GRUB_ENABLE_CRYPTODISK=n"
+    - shell: |
+        update-grub
 
-    # - lineinfile:
-    #     path: /etc/environment
-    #     regexp: MOZ_ENABLE_WAYLAND
-    #     line: "MOZ_ENABLE_WAYLAND=1"
+    - lineinfile:
+        path: /etc/environment
+        regexp: MOZ_ENABLE_WAYLAND
+        line: "MOZ_ENABLE_WAYLAND=1"
 
-    # - shell: |
-    #     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
-    # - shell: |
-    #     env DEBIAN_FRONTEND=noninteractive dpkg-reconfigure libdvd-pkg
+    - shell: |
+        env DEBIAN_FRONTEND=noninteractive dpkg-reconfigure libdvd-pkg
 
+    # CAREFUL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     # - name: "create liw/.radicle/keys"
     #   file:
     #     state: directory
@@ -218,8 +182,8 @@
       - repo: |
           deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
 
-      # - repo: |
-      #     deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware
+      - repo: |
+          deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware
 
       - repo: deb http://apt.liw.fi/debian unstable main
         signing_key: "{{ apt_liw_fi_signing_key }}"
@@ -230,7 +194,7 @@
         comment: Lars Wirzenius
         groups:
           - audio
-#          - bluetooth
+          - bluetooth
           - cdrom
           - dialout
           - dip
@@ -238,7 +202,7 @@
           - kvm
           - netdev
           - plugdev
-#          - scanner
+          - scanner
           - video
 
     mailname: "tursas.liw.fi"
@@ -249,10 +213,11 @@
 
     sshd_version: 1
 
-    # rustup_cargo_install: |
-    #   cargo-cache \
-    #   pikchr-cli \
-    #   bottom
+    rustup_cargo_install: |
+      cargo-cache \
+      pikchr-cli \
+      bottom
 
+    # CAREFUL!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     # radicle_key: "{{ lookup('pipe', 'pass radicle/liw/key') }}"
     # radicle_pub: "{{ lookup('pipe', 'pass radicle/liw/key.pub') }}"