From 4781c75b2e068aa672008b8d8bb44329a57c0f68 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 7 Feb 2024 11:29:31 +0200
Subject: radicle-other-node: install Radicle

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author
---
 ansible/radicle-other-node.yml | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/ansible/radicle-other-node.yml b/ansible/radicle-other-node.yml
index 0bc0fe8..774fe8c 100644
--- a/ansible/radicle-other-node.yml
+++ b/ansible/radicle-other-node.yml
@@ -4,53 +4,35 @@
   roles:
     - role: sane_debian_system
     - role: sshd
-    - role: comfortable-debian-system
     - role: unix_users
-    - role: rust-rustup
-    - role: liw
   tasks:
     - name: "install important additional packages"
       apt:
         name:
-          - moreutils
-          - nmap
-          - ripgrep
+          - curl
+          - git
 
-    - name: "install radicle using installer"
+    - name: "install of upgrade Radicle using installer"
       shell: |
-        filename="/home/liw/.radicle/bin/rad"
+        # Can't use "set -o pipefail" here, because shell may not be
+        # bash. So we don't use a pipe from curl to bash, and download
+        # as one command and run script as a second command. If the
+        # download fails, the task fails.
 
-        install=false
-        if [ ! -e "$filename" ]; then
-                install=true
-        else
-                weekago="$(date -d 'week ago' +%s)"
-                mtime="$(stat -c %Y "$filename")"
-                if [ "$mtime" -lt "$weekago" ]; then
-                        install=true
-                fi
-        fi
-
-        if $install; then
-            curl -sSf https://radicle.xyz/install | sudo -u liw bash
-        fi
+        curl -sSf https://radicle.xyz/install > radicle-install
+        sudo -u _rad bash radicle-install
   vars:
-    ansible_python_interpreter: /usr/bin/python3
-
     sane_debian_system_version: 2
     sane_debian_system_hostname: "{{ inventory_hostname }}"
     sane_debian_system_codename: bookworm
     sane_debian_system_timezone: Europe/Helsinki
     sane_debian_system_sources_lists:
       - repo: |
-          deb http://security.debian.org/debian-security bookworm-security main contrib non-free
+          deb http://security.debian.org/debian-security bookworm-security main
 
     unix_users_version: 2
     unix_users:
-      - username: liw
-        comment: Lars Wirzenius
+      - username: _rad
+        comment: Radicle node
 
     sshd_version: 1
-
-    rustup_cargo_install: |
-      starship
-- 
cgit v1.2.1