From 912d8eaa0f3b9cbd564dc1e09bc9b72216e6a93e Mon Sep 17 00:00:00 2001 From: POTIER Mathieu Date: Sat, 23 Nov 2024 21:34:50 +0100 Subject: [PATCH 1/2] Update map.jinja Fix deownload url --- plex/map.jinja | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plex/map.jinja b/plex/map.jinja index 7f9ba8e..dd62830 100644 --- a/plex/map.jinja +++ b/plex/map.jinja @@ -12,9 +12,10 @@ 'build=' + salt['grains.get']('kernel')|lower + '-' + salt['grains.get']('cpuarch') + '&distro=' + salt['grains.get']('os_family')|lower %} {% else %} + {# https://downloads.plex.tv/plex-media-server-new/1.41.2.9200-c6bbc1b53/debian/plexmediaserver_1.41.2.9200-c6bbc1b53_amd64.deb #} {% set j1, j2, x86, extension = ('_', '_', 'amd64', '.deb') if salt['grains.get']('os_family') == 'Debian' else ('-', '.', 'x86_64', '.rpm') %} {% set arch = x86 if salt['grains.get']('cpuarch') == 'x86_64' else 'i386' %} - {% set url = 'https://downloads.plex.tv/plex-media-server/' + plex.version + '/plexmediaserver' + j1 + plex.version + j2 + arch + extension %} + {% set url = 'https://downloads.plex.tv/plex-media-server-new/' + plex.version + '/' + salt['grains.get']('os_family')|lower + '/plexmediaserver' + j1 + plex.version + j2 + arch + extension %} {% endif %} From 0d1732211e5bc9bd0d19ec7cf8d62c87ca5bc294 Mon Sep 17 00:00:00 2001 From: POTIER Mathieu Date: Sat, 23 Nov 2024 22:33:19 +0100 Subject: [PATCH 2/2] support for arm64 (pi5) --- plex/map.jinja | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plex/map.jinja b/plex/map.jinja index dd62830..5034bc7 100644 --- a/plex/map.jinja +++ b/plex/map.jinja @@ -1,7 +1,6 @@ {% import_yaml 'plex/defaults.yaml' as default_settings %} {% set plex = salt['pillar.get']('plex', default=default_settings.get('plex'), merge=True) %} - {% if 'latest' in plex.version %} {# Windows: https://plex.tv/downloads/latest/5?&build=windows-x86&distro=windows #} {# Mac: https://plex.tv/downloads/latest/5?&build=darwin-x86_64&distro=macos #} @@ -14,11 +13,16 @@ {% else %} {# https://downloads.plex.tv/plex-media-server-new/1.41.2.9200-c6bbc1b53/debian/plexmediaserver_1.41.2.9200-c6bbc1b53_amd64.deb #} {% set j1, j2, x86, extension = ('_', '_', 'amd64', '.deb') if salt['grains.get']('os_family') == 'Debian' else ('-', '.', 'x86_64', '.rpm') %} - {% set arch = x86 if salt['grains.get']('cpuarch') == 'x86_64' else 'i386' %} + {% if salt['grains.get']('cpuarch') == 'x86_64' %} + {% set arch = 'x86' %} + {% elif salt['grains.get']('cpuarch') == 'aarch64' %} + {% set arch = 'arm64' %} + {% else %} + {% set arch = 'i386' %} + {% endif %} {% set url = 'https://downloads.plex.tv/plex-media-server-new/' + plex.version + '/' + salt['grains.get']('os_family')|lower + '/plexmediaserver' + j1 + plex.version + j2 + arch + extension %} {% endif %} - {% do plex.update({ 'url': url }) %}