Merge pull request #179 from anarion80/pull_upstream

Pull upstream
anarion80 · Aug 26, 2024 · 48bb369 · 48bb369
2 parents 2dbf061 + 139fc61
commit 48bb369
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/roles/portainer/tasks/main.yml b/roles/portainer/tasks/main.yml
@@ -1,6 +1,11 @@
 ---
 - name: Start Portainer
   block:
+    - name: Check for Deprecated IP Whitelist setting
+      ansible.builtin.fail:
+        msg: "Use portainer_ip_allowlist instead of portainer_ip_whitelist! Read https://traefik.io/blog/announcing-traefik-proxy-v2-11/ for more information."
+      when: portainer_ip_whitelist is defined
+
     - name: Create Portainer Directories
       ansible.builtin.file:
         path: "{{ item }}"
@@ -28,8 +33,8 @@
           traefik.http.routers.portainer.tls.domains[0].main: "{{ ansible_nas_domain }}"
           traefik.http.routers.portainer.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"
           traefik.http.services.portainer.loadbalancer.server.port: "9443"
-          traefik.http.routers.portainer.middlewares: "portainer-IPAllowList@docker"
-          traefik.http.middlewares.portainer-IPAllowList.IPAllowList.sourcerange: "{{ portainer_ip_allowlist }}"
+          traefik.http.routers.portainer.middlewares: "portainer-ipallowlist@docker"
+          traefik.http.middlewares.portainer-ipallowlist.ipallowlist.sourcerange: "{{ portainer_ip_allowlist }}"
   when: portainer_enabled is true
 
 - name: Stop Portainer

diff --git a/roles/romm/defaults/main.yml b/roles/romm/defaults/main.yml
@@ -18,7 +18,7 @@ romm_hostname: "romm"
 
 # docker
 romm_container_name: "romm"
-romm_image_name: "zurdi15/romm"
+romm_image_name: "rommapp/romm"
 romm_image_version: "latest"
 
 romm_db_container_name: "romm-db"
@@ -38,6 +38,12 @@ romm_redis_memory: 1g
 romm_igdb_client_id: "abcd"
 romm_igdb_client_secret: "abcd"
 
+# MobyGames auth credentials
+romm_mobygames_client_id: "abcd"
+
+# SteamGridDB auth credentials
+romm_steamgriddb_client_id: "abcd"
+
 # auth config
 romm_auth_secret_key: "aaaabbbbccccdddd" # Generate a key with `openssl rand -hex 32`
 romm_auth_username: "admin"

diff --git a/roles/romm/tasks/main.yml b/roles/romm/tasks/main.yml
@@ -56,6 +56,8 @@
           REDIS_PORT: "6379"
           IGDB_CLIENT_ID: "{{ romm_igdb_client_id }}"
           IGDB_CLIENT_SECRET: "{{ romm_igdb_client_secret }}"
+          MOBYGAMES_API_KEY: "{{ romm_mobygames_client_id }}"
+          STEAMGRIDDB_API_KEY: "{{ romm_steamgriddb_client_id }}"
           ROMM_AUTH_USERNAME: "{{ romm_auth_username }}"
           ROMM_AUTH_PASSWORD: "{{ romm_auth_password }}"
         restart_policy: unless-stopped