fix arm64 repos and remove non-existent

fspv · Dec 9, 2024 · 1828d8d · 1828d8d
1 parent 4458ef9
commit 1828d8d
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 13 deletions.
diff --git a/roles/apt/defaults/main.yml b/roles/apt/defaults/main.yml
@@ -4,5 +4,4 @@ apt_repos:
   - ubuntu-security
   - ubuntu-updates
   - ubuntu-backports
-  # - ubuntu-partner
   # - ppa-pv-safronov-backports
diff --git a/roles/apt/templates/etc/apt/preferences.d/ubuntu-partner.pref.j2 b/roles/apt/templates/etc/apt/preferences.d/ubuntu-partner.pref.j2
diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu-backports.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu-backports.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_architecture == "armv7l" %}
+{% if ansible_architecture == "armv7l" or ansible_architecture == "aarch64" %}
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.

diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu-partner.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu-partner.list.j2
diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu-proposed.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu-proposed.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_architecture == "armv7l" %}
+{% if ansible_architecture == "armv7l" or ansible_architecture == "aarch64" %}
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.

diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu-security.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu-security.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_architecture == "armv7l" %}
+{% if ansible_architecture == "armv7l" or ansible_architecture == "aarch64" %}
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.

diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu-updates.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu-updates.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_architecture == "armv7l" %}
+{% if ansible_architecture == "armv7l" or ansible_architecture == "aarch64" %}
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.

diff --git a/roles/apt/templates/etc/apt/sources.list.d/ubuntu.list.j2 b/roles/apt/templates/etc/apt/sources.list.d/ubuntu.list.j2
@@ -1,4 +1,4 @@
-{% if ansible_architecture == "armv7l" %}
+{% if ansible_architecture == "armv7l" or ansible_architecture == "aarch64" %}
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
 ## review or updates from the Ubuntu security team.

diff --git a/roles/docker/templates/etc/apt/sources.list.d/docker-ce.list b/roles/docker/templates/etc/apt/sources.list.d/docker-ce.list
@@ -1 +1 @@
-deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
+deb [arch={{ 'arm64' if ansible_architecture == "armv7l" or ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
diff --git a/roles/ubuntu-devserver/meta/main.yml b/roles/ubuntu-devserver/meta/main.yml
@@ -1,6 +1,5 @@
 dependencies:
   - { role: docker }
-  - { role: openvpn }
   - { role: tailscale }
   - { role: et }
   - { role: nvim }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		deb [arch=amd64] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable
		deb [arch={{ 'arm64' if ansible_architecture == "armv7l" or ansible_architecture == 'aarch64' else 'amd64' }}] https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable