summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2024-01-07 08:42:55 +0200
committerLars Wirzenius <liw@liw.fi>2024-01-07 08:42:55 +0200
commit033b901eeaa331e2847e726e3f4ea519974287eb (patch)
treebd366d46fd616e0ec5a9c7923a6d226d08cde6c9
parent8d5f307dd7126e670e7f70ea79610a4243f10e20 (diff)
downloadansibleness-033b901eeaa331e2847e726e3f4ea519974287eb.tar.gz
radicle updates
-rw-r--r--ansible/hosts1
-rw-r--r--ansible/radicle-multi.yml50
-rw-r--r--ansible/radicle.liw.fi.yml22
3 files changed, 67 insertions, 6 deletions
diff --git a/ansible/hosts b/ansible/hosts
index 5b4a9b6..6d9148d 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -15,6 +15,7 @@ obnam-bench
obnam-dev
radicle-dev
radicle-liw3
+radicle-multi
radicle-other-node
radicle-test
riki-dev
diff --git a/ansible/radicle-multi.yml b/ansible/radicle-multi.yml
new file mode 100644
index 0000000..6b695c9
--- /dev/null
+++ b/ansible/radicle-multi.yml
@@ -0,0 +1,50 @@
+- hosts: radicle-multi
+ remote_user: debian
+ become: yes
+ roles:
+ - role: sane_debian_system
+ - role: sshd
+ - role: comfortable-debian-system
+ - role: unix_users
+ - role: rust-rustup
+ - role: liw
+ tasks:
+ - name: "disable access to seed.radicle.garden in DNS"
+ lineinfile:
+ path: /etc/hosts
+ regex: seed.radicle.garden
+ line: 127.0.0.1 seed.radicle.garden
+
+ - name: "disable access to seed.radicle.xyz in DNS"
+ lineinfile:
+ path: /etc/hosts
+ regex: seed.radicle.xyz
+ line: 127.0.0.1 seed.radicle.xyz
+
+ - name: "install important additional packages"
+ apt:
+ name:
+ - moreutils
+ - nmap
+ - ripgrep
+ 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
+
+ unix_users_version: 2
+ unix_users:
+ - username: liw
+ comment: Lars Wirzenius
+ sudo: yes
+
+ sshd_version: 1
+
+ rustup_cargo_install: |
+ starship
diff --git a/ansible/radicle.liw.fi.yml b/ansible/radicle.liw.fi.yml
index 5cc39ca..076c512 100644
--- a/ansible/radicle.liw.fi.yml
+++ b/ansible/radicle.liw.fi.yml
@@ -32,6 +32,13 @@
}
dest: /etc/caddy/Caddyfile
+ - name: "create directory for CI logs"
+ file:
+ state: directory
+ path: /srv/http
+ owner: liw
+ group: liw
+
- name: "restart Caddy"
systemd:
name: caddy
@@ -148,8 +155,8 @@
(cd "$dir" && cargo install --path=. --root="$root")
}
- clone_install https://radicle.liw.fi/zwTxygwuz5LDGBq255RA2CbNGrz8.git radicle-ci-broker "$(pwd)/root"
- clone_install https://radicle.liw.fi/z3qg5TKmN83afz2fj9z3fQjU8vaYE.git radicle-native-ci "$(pwd)/root"
+ clone_install git://git.liw.fi/radicle-ci-broker radicle-ci-broker "$(pwd)/root"
+ clone_install git://git.liw.fi/radicle-native-ci radicle-native-ci "$(pwd)/root"
install root/bin/* $HOME/bin
dest: /home/liw/install-radicle-ci
@@ -200,9 +207,13 @@
env:
RADICLE_NATIVE_CI: /home/liw/native-ci.yaml
filters:
- - !And
- - !Repository "rad:zZnk3hS8C3WAhnv7mWcCUToCqpBs"
- - !AnyPatch
+ - !Or
+ - !And
+ - !Repository "rad:zZnk3hS8C3WAhnv7mWcCUToCqpBs"
+ - !AnyPatch
+ - !And
+ - !Repository "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5"
+ - !AnyPatch
dest: /home/liw/ci-broker.yaml
owner: liw
group: liw
@@ -236,7 +247,6 @@
[Service]
Type=simple
Environment=RAD_HOME=/home/liw/.radicle
- Environment=RUST_LOG=trace
Environment=PATH=/home/liw/bin:/home/liw/.cargo/bin:/home/liw/.local/bin:/home/liw/.radicle/bin:/bin:/sbin
ExecStart=bash -c '/home/liw/bin/ci-broker /home/liw/ci-broker.yaml >> /srv/http/broker.log'
KillMode=process