Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull upstream #179

Merged
merged 11 commits into from
Aug 26, 2024
9 changes: 7 additions & 2 deletions roles/portainer/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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 }}"
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion roles/romm/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions roles/romm/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading