From 52523b0b8a1ec251b5e861d7d33a49e0ef5ce074 Mon Sep 17 00:00:00 2001 From: saltydk Date: Tue, 10 Oct 2023 17:45:26 +0200 Subject: [PATCH] Github: Use Saltbox Version Manager Replaces Cloudbox Version Manager --- inventories/group_vars/all.yml | 4 ++-- roles/btop/defaults/main.yml | 2 +- roles/docker/defaults/main.yml | 2 +- roles/node_exporter/defaults/main.yml | 2 +- roles/rclone/defaults/main.yml | 2 +- roles/rclone/tasks/subtasks/01_build_url.yml | 2 +- roles/sanity_check/tasks/subtasks/09_repo.yml | 2 +- roles/sub_zero/defaults/main.yml | 2 +- roles/transfer/tasks/main.yml | 2 +- roles/unionfs/defaults/main.yml | 2 +- roles/webtools/defaults/main.yml | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml index c9110291a6..062bd98fc7 100644 --- a/inventories/group_vars/all.yml +++ b/inventories/group_vars/all.yml @@ -441,10 +441,10 @@ docker_log_options: "{{ docker_log_options_json else 'default' }}" ################################ -# Cloudbox Version Manager +# Saltbox Version Manager ################################ -cvm: https://cvm.saltbox.dev/version?url= +svm: https://svm.saltbox.dev/version?url= ################################ # Global Variables diff --git a/roles/btop/defaults/main.yml b/roles/btop/defaults/main.yml index 8c0d9d2191..07e4106780 100644 --- a/roles/btop/defaults/main.yml +++ b/roles/btop/defaults/main.yml @@ -7,7 +7,7 @@ # GNU General Public License v3.0 # ######################################################################### --- -btop_releases_url: "{{ cvm }}https://api.github.com/repos/aristocratos/btop/releases/latest" +btop_releases_url: "{{ svm }}https://api.github.com/repos/aristocratos/btop/releases/latest" btop_releases_download_url: https://github.com/aristocratos/btop/releases/download diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index b5c4d71473..e7e2ca1024 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -122,7 +122,7 @@ docker_update_hosts_service_runtime_max: "3600s" docker_daemon_storage_driver: "{{ ('zfs' in var_lib_file_system.stdout) | ternary('zfs', 'overlay2') }}" -fuse_overlayfs_releases_url: "{{ cvm }}https://api.github.com/repos/containers/fuse-overlayfs/releases/latest" +fuse_overlayfs_releases_url: "{{ svm }}https://api.github.com/repos/containers/fuse-overlayfs/releases/latest" fuse_overlayfs_release_lookup_command: | curl -s {{ fuse_overlayfs_releases_url }} \ diff --git a/roles/node_exporter/defaults/main.yml b/roles/node_exporter/defaults/main.yml index 9a9c06dd5a..d03f14f481 100644 --- a/roles/node_exporter/defaults/main.yml +++ b/roles/node_exporter/defaults/main.yml @@ -9,7 +9,7 @@ --- node_exporter_path: "/opt/node_exporter" -node_exporter_latest_releases_url: "{{ cvm }}https://api.github.com/repos/prometheus/node_exporter/releases/latest" +node_exporter_latest_releases_url: "{{ svm }}https://api.github.com/repos/prometheus/node_exporter/releases/latest" node_exporter_latest_release_lookup_command: | curl -s {{ node_exporter_latest_releases_url }} \ diff --git a/roles/rclone/defaults/main.yml b/roles/rclone/defaults/main.yml index 1c3096b519..0315d9e9a3 100644 --- a/roles/rclone/defaults/main.yml +++ b/roles/rclone/defaults/main.yml @@ -7,7 +7,7 @@ # GNU General Public License v3.0 # ######################################################################### --- -rclone_latest_releases_url: "{{ cvm }}https://api.github.com/repos/rclone/rclone/releases/latest" +rclone_latest_releases_url: "{{ svm }}https://api.github.com/repos/rclone/rclone/releases/latest" rclone_latest_release_lookup_command: | curl -s {{ rclone_latest_releases_url }} \ diff --git a/roles/rclone/tasks/subtasks/01_build_url.yml b/roles/rclone/tasks/subtasks/01_build_url.yml index 3aa7149ba0..20625557ee 100644 --- a/roles/rclone/tasks/subtasks/01_build_url.yml +++ b/roles/rclone/tasks/subtasks/01_build_url.yml @@ -67,7 +67,7 @@ - name: Build URL | Check if version '{{ rclone_version_specified0 }}' is available ansible.builtin.shell: | - curl -sL {{ cvm }}https://api.github.com/repos/ncw/rclone/git/refs/tags \ + curl -sL {{ svm }}https://api.github.com/repos/ncw/rclone/git/refs/tags \ | jq -r '.[] | .ref' | sed 's/\/\?refs\/tags\/v//g' \ | grep '{{ rclone_version_specified0 }}' register: rclone_version_specified0_check diff --git a/roles/sanity_check/tasks/subtasks/09_repo.yml b/roles/sanity_check/tasks/subtasks/09_repo.yml index 8ac19bd50d..40b58cca5f 100644 --- a/roles/sanity_check/tasks/subtasks/09_repo.yml +++ b/roles/sanity_check/tasks/subtasks/09_repo.yml @@ -16,7 +16,7 @@ register: git_version - name: Repository | Check Git Origin Hash - ansible.builtin.shell: "curl -L --connect-timeout 2.37 -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28' https://api.github.com/repos/saltyorg/Saltbox/commits?sha={{ git_branch.stdout }} | jq -r '.[0][\"sha\"]'" + ansible.builtin.shell: "curl -L --connect-timeout 2.37 -H 'Accept: application/vnd.github+json' -H 'X-GitHub-Api-Version: 2022-11-28' {{ svm }}https://api.github.com/repos/saltyorg/Saltbox/commits?sha={{ git_branch.stdout }} | jq -r '.[0][\"sha\"]'" register: git_origin_version ignore_errors: true diff --git a/roles/sub_zero/defaults/main.yml b/roles/sub_zero/defaults/main.yml index 67db2b6790..d564f40933 100644 --- a/roles/sub_zero/defaults/main.yml +++ b/roles/sub_zero/defaults/main.yml @@ -19,6 +19,6 @@ plex_plugin_subzero_paths_info_plist_location: "{{ plex_plugin_subzero_paths_loc # Repository ################################ -plex_plugin_subzero_release_url: "{{ cvm }}https://api.github.com/repos/pannal/Sub-Zero.bundle/releases/latest" +plex_plugin_subzero_release_url: "{{ svm }}https://api.github.com/repos/pannal/Sub-Zero.bundle/releases/latest" plex_plugin_subzero_download_url_backup: https://github.com/pannal/Sub-Zero.bundle/releases/download/2.6.5.3152/Sub-Zero.bundle-2.6.5.3152.zip diff --git a/roles/transfer/tasks/main.yml b/roles/transfer/tasks/main.yml index 523c4673a9..a29eb4e362 100644 --- a/roles/transfer/tasks/main.yml +++ b/roles/transfer/tasks/main.yml @@ -30,7 +30,7 @@ block: - name: Get latest transfer URL ansible.builtin.shell: >- - curl -s {{ cvm }}https://api.github.com/repos/l3uddz/transfer/releases/latest | + curl -s {{ svm }}https://api.github.com/repos/l3uddz/transfer/releases/latest | jq -r ".assets[] | select(.name | test(\"transfer_v[0-9].[0-9].[0-9]_linux_amd64\")) | .browser_download_url" args: executable: /bin/bash diff --git a/roles/unionfs/defaults/main.yml b/roles/unionfs/defaults/main.yml index a5e63fa936..b0b79155b1 100644 --- a/roles/unionfs/defaults/main.yml +++ b/roles/unionfs/defaults/main.yml @@ -27,7 +27,7 @@ mergerfs_version: latest mergerfs_github_endpoint: "{{ 'latest' if (mergerfs_version == 'latest') else 'tags/' + mergerfs_version }}" -mergerfs_releases_url: "{{ cvm }}https://api.github.com/repos/trapexit/mergerfs/releases/{{ mergerfs_github_endpoint }}" +mergerfs_releases_url: "{{ svm }}https://api.github.com/repos/trapexit/mergerfs/releases/{{ mergerfs_github_endpoint }}" mergerfs_releases_download_url: https://github.com/trapexit/mergerfs/releases/download diff --git a/roles/webtools/defaults/main.yml b/roles/webtools/defaults/main.yml index 696231969b..1ce8d711cc 100644 --- a/roles/webtools/defaults/main.yml +++ b/roles/webtools/defaults/main.yml @@ -21,6 +21,6 @@ plex_plugin_webtools_paths_preferences_location: "{{ plex_paths_plugin_support_l # Repository ################################ -plex_plugin_webtools_release_url: "{{ cvm }}https://api.github.com/repos/ukdtom/WebTools.bundle/releases/latest" +plex_plugin_webtools_release_url: "{{ svm }}https://api.github.com/repos/ukdtom/WebTools.bundle/releases/latest" plex_plugin_webtools_download_url_backup: https://github.com/ukdtom/WebTools.bundle/releases/download/3.0.0/WebTools.bundle.zip