Merge branch 'evilham-evilham-improve-devuan-support'

debops · Aug 10, 2019 · 600cbd4 · 600cbd4
2 parents d4778f0 + 9822dac
commit 600cbd4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ansible/roles/debops.apt/defaults/main.yml b/ansible/roles/debops.apt/defaults/main.yml
@@ -458,7 +458,7 @@ apt__default_sources:
                       if (apt__architecture not in ["amd64", "i386"])
                       else "absent" }}'
 
-  - uri:          'http://auto.mirror.devuan.org/merged'
+  - uri:          'http://deb.devuan.org/merged'
     comment:      '{{ "Official " + apt__distribution + " repositories" }}'
     distribution: 'Devuan'
     state:        '{{ apt__default_sources_state }}'
@@ -555,7 +555,7 @@ apt__security_sources:
                       if (apt__architecture not in ["amd64", "i386"])
                       else "absent" }}'
 
-  - uri:          'http://auto.mirror.devuan.org/merged'
+  - uri:          'http://deb.devuan.org/merged'
     comment:      'Devuan Security repository'
     type:         '{{ apt__source_types }}'
     suite:        '{{ apt__distribution_release + "-security" }}'

diff --git a/ansible/roles/debops.unattended_upgrades/defaults/main.yml b/ansible/roles/debops.unattended_upgrades/defaults/main.yml
@@ -113,6 +113,11 @@ unattended_upgrades__security_origins:
     - 'o=Debian,n=${distro_codename},l=Debian-Security'
     - 'o=${distro_id},n=${distro_codename}-updates'
 
+  # https://www.devuan.org/
+  'Devuan':
+    - 'o=Devuan,n=${distro_codename}-security,l=Devuan-Security'
+    - 'o=Devuan,n=${distro_codename}-updates'
+
   # http://www.ubuntu.com/usn/
   'Ubuntu':
     - 'o=Ubuntu,n=${distro_codename},a=${distro_codename}-security'
@@ -137,6 +142,10 @@ unattended_upgrades__release_origins:
     - 'o=${distro_id},n=${distro_codename}'
     - 'o=${distro_id} Backports,n=${distro_codename}-backports'
 
+  'Devuan':
+    - 'o=${distro_id},n=${distro_codename}'
+    - 'o=${distro_id} Backports,n=${distro_codename}-backports'
+
   'Ubuntu':
     - 'o=Ubuntu,n=${distro_codename},a=${distro_codename}'
     - 'o=Ubuntu,n=${distro_codename},a=${distro_codename}-backports'