diff --git a/swarm/kuma.yaml b/swarm/kuma.yaml index 891570c..4ccdd5f 100644 --- a/swarm/kuma.yaml +++ b/swarm/kuma.yaml @@ -32,36 +32,36 @@ services: - kuma.kuma.http.name=Uptime Kuma - kuma.kuma.http.url=https://kuma.netgrimoire.com - # autokuma: - # image: ghcr.io/bigboot/autokuma:latest - # environment: - # AUTOKUMA__KUMA__URL: http://kuma:3001 - # AUTOKUMA__KUMA__USERNAME: traveler - # AUTOKUMA__KUMA__PASSWORD: F@lcon12 - # AUTOKUMA__TAG_NAME: AutoKuma - # AUTOKUMA__DOCKER__SOURCE: "DockerSwarm" - # # AUTOKUMA__MIGRATE: "true" - # volumes: - # - /var/run/docker.sock:/var/run/docker.sock - # - /data/nfs/znas/Docker/AutoKuma:/data - # networks: - # - netgrimoire - # deploy: - # placement: - # constraints: - # - node.role == manager - ## restart_policy: - # condition: on-failure - ### delay: 5s - # labels: - ## - diun.enable=true - # - homepage.group=Monitoring - # - homepage.name=AutoKuma - # - homepage.icon=uptime-kuma.png - ## - homepage.href=https://kuma.netgrimoire.com - # - homepage.description=Kuma Monitor Automation - # - kuma.autokuma.http.name=AutoKuma - # - kuma.autokuma.http.url=https://kuma.netgrimoire.com + autokuma: + image: ghcr.io/bigboot/autokuma:latest + environment: + AUTOKUMA__KUMA__URL: http://kuma:3001 + AUTOKUMA__KUMA__USERNAME: traveler + AUTOKUMA__KUMA__PASSWORD: F@lcon12 + AUTOKUMA__TAG_NAME: AutoKuma + AUTOKUMA__DOCKER__SOURCE: "DockerSwarm" + # AUTOKUMA__MIGRATE: "true" + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - /data/nfs/znas/Docker/AutoKuma:/data + networks: + - netgrimoire + deploy: + placement: + constraints: + - node.role == manager + restart_policy: + condition: on-failure + delay: 5s + labels: + - diun.enable=true + - homepage.group=Monitoring + - homepage.name=AutoKuma + - homepage.icon=uptime-kuma.png + - homepage.href=https://kuma.netgrimoire.com + - homepage.description=Kuma Monitor Automation + - kuma.autokuma.http.name=AutoKuma + - kuma.autokuma.http.url=https://kuma.netgrimoire.com networks: netgrimoire: diff --git a/swarm/mealie.yaml b/swarm/mealie.yaml index bb63c51..e8f02bc 100644 --- a/swarm/mealie.yaml +++ b/swarm/mealie.yaml @@ -1,62 +1,61 @@ services: - recipe: - image: ghcr.io/mealie-recipes/mealie:latest - ports: - - "9927:9000" - environment: - PUID: "1964" - PGID: "1964" - TZ: America/Chicago - MAX_WORKERS: "1" - WEB_CONCURRENCY: "1" - BASE_URL: https://recipe.netgrimoire.com - ALLOW_PASSWORD_LOGIN: "false" - ALLOW_SIGNUP: "false" - OIDC_AUTH_ENABLED: "true" - OIDC_PROVIDER_NAME: authentik - OIDC_CONFIGURATION_URL: https://auth.netgrimoire.com/application/o/mealie/.well-known/openid-configuration - OIDC_CLIENT_ID: tidMeWe3Ak30zRzcmC5vwoCqAIHXQsaVwJEp44Mz - OIDC_CLIENT_SECRET: OD0CLgELUEWGoZ8IUnduGbxhyhh4vgjMBxBAjyopNOkATWIEWSYeWRDdfY6ulX2Fj7zuUp9dpgzjoFatNviLD8E5Cv2815eDrZxH9gNb52Taur0LzqBPk25yLCvsnjXK - OIDC_AUTO_REDIRECT: "true" - OIDC_REMEMBER_ME: "true" - OIDC_SIGNUP_ENABLED: "true" - OIDC_USER_CLAIM: sub - OIDC_NAME_CLAIM: preferred_username - OIDC_GROUPS_CLAIM: groups - OIDC_SCOPES_OVERRIDE: openid profile email - OIDC_USER_GROUP: mealie-users - OIDC_ADMIN_GROUP: mealie-admins - volumes: - - /DockerVol/mealie:/app/data - networks: - - netgrimoire - deploy: - restart_policy: - condition: any - delay: 5s - max_attempts: 3 - window: 120s - placement: - constraints: - - node.platform.arch != aarch64 - - node.platform.arch != arm - - node.hostname == docker4 - labels: - caddy: recipe.netgrimoire.com - caddy.reverse_proxy: recipe:9000 - caddy.import_1: crowdsec - caddy.import_2: authentik + image: ghcr.io/mealie-recipes/mealie:latest + ports: + - "9925:9000" + environment: + PUID: "1964" + PGID: "1964" + TZ: America/Chicago + MAX_WORKERS: "1" + WEB_CONCURRENCY: "1" + BASE_URL: https://recipe.netgrimoire.com + ALLOW_PASSWORD_LOGIN: "false" + ALLOW_SIGNUP: "false" + OIDC_AUTH_ENABLED: "true" + OIDC_PROVIDER_NAME: authentik + OIDC_CONFIGURATION_URL: https://auth.netgrimoire.com/application/o/mealie/.well-known/openid-configuration + OIDC_CLIENT_ID: tidMeWe3Ak30zRzcmC5vwoCqAIHXQsaVwJEp44Mz + OIDC_CLIENT_SECRET: OD0CLgELUEWGoZ8IUnduGbxhyhh4vgjMBxBAjyopNOkATWIEWSYeWRDdfY6ulX2Fj7zuUp9dpgzjoFatNviLD8E5Cv2815eDrZxH9gNb52Taur0LzqBPk25yLCvsnjXK + OIDC_AUTO_REDIRECT: "true" + OIDC_REMEMBER_ME: "true" + OIDC_SIGNUP_ENABLED: "true" + OIDC_USER_CLAIM: sub + OIDC_NAME_CLAIM: preferred_username + OIDC_GROUPS_CLAIM: groups + OIDC_SCOPES_OVERRIDE: openid profile email + OIDC_USER_GROUP: mealie-users + OIDC_ADMIN_GROUP: mealie-admins + volumes: + - /DockerVol/mealie:/app/data + networks: + - netgrimoire + deploy: + restart_policy: + condition: any + delay: 5s + max_attempts: 3 + window: 120s + placement: + constraints: + - node.platform.arch != aarch64 + - node.platform.arch != arm + - node.hostname == docker4 + labels: + caddy: recipe.netgrimoire.com + caddy.reverse_proxy: recipe:9000 + caddy.import_1: crowdsec + caddy.import_2: authentik - kuma.name: Mealie - kuma.url: https://recipe.netgrimoire.com + kuma.name: Mealie + kuma.url: https://recipe.netgrimoire.com - homepage.group: PNCHarris Apps - homepage.name: Mealie - homepage.icon: mealie.png - homepage.href: https://recipe.netgrimoire.com - homepage.description: Recipe Manager + homepage.group: PNCHarris Apps + homepage.name: Mealie + homepage.icon: mealie.png + homepage.href: https://recipe.netgrimoire.com + homepage.description: Recipe Manager - diun.enable: "true" + diun.enable: "true" networks: netgrimoire: