diff options
-rw-r--r-- | ansible/hosts | 3 | ||||
-rw-r--r-- | ansible/mirror-git.yml | 12 | ||||
-rw-r--r-- | ansible/roles/mail-server/files/aliases | 1 | ||||
-rw-r--r-- | ansible/sequoia-dev.yml | 23 |
4 files changed, 24 insertions, 15 deletions
diff --git a/ansible/hosts b/ansible/hosts index 542927e..cca4309 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -40,7 +40,8 @@ subplot-dan-dev ewww-dev clab-dev -sequoia-dev +sequoia-dev-e1 +sequoia-dev-e5 raidtest diff --git a/ansible/mirror-git.yml b/ansible/mirror-git.yml index a2cbe9e..f060160 100644 --- a/ansible/mirror-git.yml +++ b/ansible/mirror-git.yml @@ -5,7 +5,7 @@ - role: sane_debian_system - role: unix_users - role: self-updating-system - - smarthost-client + - role: smarthost-client tasks: - name: "install git and more" apt: @@ -35,13 +35,13 @@ job: | chronic /usr/local/bin/gitlab-to-git.liw.fi vars: - sane_debian_system_version: 2 - unix_users_version: 2 + ansible_python_interpreter: /usr/bin/python3 + sane_debian_system_version: 2 sane_debian_system_hostname: mirror-git - sane_debian_system_codename: buster - sane_debian_system_mirror: deb.debian.org + sane_debian_system_codename: bullseye + unix_users_version: 2 unix_users: - username: root authorized_keys: | @@ -55,7 +55,7 @@ {{ lookup('pipe', 'pass show ssh/liw@mirror-git') }} ssh_key_pub: | {{ lookup('pipe', 'pass show ssh/liw@mirror-git.pub') }} - + mailname: mirror-git.vm.liw.fi hostname: "{{ sane_debian_system_hostname }}" diff --git a/ansible/roles/mail-server/files/aliases b/ansible/roles/mail-server/files/aliases index dd3b067..0aa8635 100644 --- a/ansible/roles/mail-server/files/aliases +++ b/ansible/roles/mail-server/files/aliases @@ -2,6 +2,7 @@ postmaster: root abuse: root root: liw +lwc: liw soilar: liw, soile hbo: liw, soile ick-conduct: liw diff --git a/ansible/sequoia-dev.yml b/ansible/sequoia-dev.yml index 864c2ed..2839112 100644 --- a/ansible/sequoia-dev.yml +++ b/ansible/sequoia-dev.yml @@ -1,4 +1,4 @@ -- hosts: sequoia-dev +- hosts: sequoia-dev-e5 remote_user: debian become: yes roles: @@ -10,21 +10,28 @@ tags: [vcs] - role: unix_users tags: [users] + - role: rust-rustup + tags: [rustup] + - role: liw + tags: [liw] tasks: - apt: name: - - shellcheck - - subplot - build-essential - - llvm + - capnproto - clang - libclang-dev - - pkg-config - - nettle-dev - - libssl-dev - - capnproto - libsqlite3-dev + - libssl-dev + - llvm + - nettle-dev + - pkg-config + - shellcheck + - subplot + - texlive-fonts-recommended + - texlive-latex-base + - texlive-latex-recommended vars: ansible_python_interpreter: /usr/bin/python3 |