diff options
| author | Lars Wirzenius <liw@liw.fi> | 2020-11-04 11:11:51 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2020-11-04 11:11:51 +0200 |
| commit | b05e3bfac3a1ebfe45fc5f4c5548bcc3ef693833 (patch) | |
| tree | 9ad1a26dca51da51c8cdfb66ee2e2d61dda1d60a /ansible/roles | |
| parent | 71e4bb9fdcdd5a4de6fd5662deebe1c1e64351cc (diff) | |
| download | ansibleness-b05e3bfac3a1ebfe45fc5f4c5548bcc3ef693833.tar.gz | |
chore: adapt to sane_debian_system version 1 and cleanups
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/riot-host/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/self-updating-system/templates/unattended-upgrades.conf | 2 | ||||
| -rw-r--r-- | ansible/roles/smarthost-client/templates/main.cf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/riot-host/tasks/main.yml b/ansible/roles/riot-host/tasks/main.yml index 8fc8563..01c9a80 100644 --- a/ansible/roles/riot-host/tasks/main.yml +++ b/ansible/roles/riot-host/tasks/main.yml @@ -4,7 +4,7 @@ dest: /etc/apt/trusted.gpg.d/ - apt_repository: - repo: "deb [signed-by=/etc/apt/trusted.gpg.d/riot-im-archive-keyring.gpg] https://packages.riot.im/debian/ {{ debian_codename }} main" + repo: "deb [signed-by=/etc/apt/trusted.gpg.d/riot-im-archive-keyring.gpg] https://packages.riot.im/debian/ {{ sane_debian_system_codename }} main" - apt: name: element-desktop diff --git a/ansible/roles/self-updating-system/templates/unattended-upgrades.conf b/ansible/roles/self-updating-system/templates/unattended-upgrades.conf index 8da165e..810b544 100644 --- a/ansible/roles/self-updating-system/templates/unattended-upgrades.conf +++ b/ansible/roles/self-updating-system/templates/unattended-upgrades.conf @@ -3,7 +3,7 @@ // updates, and then reboot during the night. Unattended-Upgrade::Origins-Pattern { - "origin=Debian,codename={{ debian_codename }},label=Debian-Security"; + "origin=Debian,codename={{ sane_debian_system_codename }},label=Debian-Security"; }; Unattended-Upgrade::Mail "root"; diff --git a/ansible/roles/smarthost-client/templates/main.cf b/ansible/roles/smarthost-client/templates/main.cf index 2c026ad..d9deaaf 100644 --- a/ansible/roles/smarthost-client/templates/main.cf +++ b/ansible/roles/smarthost-client/templates/main.cf @@ -32,7 +32,7 @@ myhostname = {{ mailname }} alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases myorigin = /etc/mailname -mydestination = {{ mailname }}, {{ hostname }}, localhost.localdomain, localhost +mydestination = {{ mailname }}, {{ sane_debian_system_hostname }}, localhost.localdomain, localhost relayhost = {{ relayhost }} mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 mailbox_command = procmail -a "$EXTENSION" |