diff --git a/bookstack/docker-compose-saml.yml b/bookstack/docker-compose-saml.yml deleted file mode 100644 index c4f33fe..0000000 --- a/bookstack/docker-compose-saml.yml +++ /dev/null @@ -1,88 +0,0 @@ ---- -version: "2" -services: - app: - image: lscr.io/linuxserver/bookstack:latest - environment: - PUID: 1000 - PGID: 1000 - APP_URL: https://bookstack.sectorq.eu - DB_HOST: db - DB_PORT: 3306 - DB_USER: bookstack - DB_PASS: l4c1j4yd33Du5lo - DB_DATABASE: bookstackapp - # Set authentication method to be saml2 - AUTH_METHOD: saml2 - # Control if BookStack automatically initiates login via your SAML system if it's the only authentication method. - # Prevents the need for the user to click the "Login with x" button on the login page. - # Setting this to true enables auto-initiation. - AUTH_AUTO_INITIATE: false - # Set the display name to be shown on the login button. - # (Login with ) - SAML2_NAME: authentik - # Name of the attribute which provides the user's email address - SAML2_EMAIL_ATTRIBUTE: email - # Name of the attribute to use as an ID for the SAML user. - SAML2_EXTERNAL_ID_ATTRIBUTE: uid - # Enable SAML group sync. - SAML2_USER_TO_GROUPS: true - # Set the attribute from which BookStack will read groups names from. - # You will need to rename your roles in Bookstack to match your groups in authentik. - SAML2_GROUP_ATTRIBUTE: http://schemas.xmlsoap.org/claims/Group - # Name of the attribute(s) to use for the user's display name - # Can have multiple attributes listed, separated with a '|' in which - # case those values will be joined with a space. - # Example: SAML2_DISPLAY_NAME_ATTRIBUTES=firstName|lastName - # Defaults to the ID value if not found. - ######SAML2_DISPLAY_NAME_ATTRIBUTES: http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname - SAML2_DISPLAY_NAME_ATTRIBUTES: username - - # Identity Provider entityID URL - SAML2_IDP_ENTITYID: https://auth.sectorq.eu/api/v3/providers/saml/10/metadata/?download - - # Auto-load metadata from the IDP - # Setting this to true negates the need to specify the next three options - SAML2_AUTOLOAD_METADATA: true - - - - - - - - volumes: - - /share/docker_data/bookstack/bookstack_app_data:/config - ports: - - 6875:80 - restart: always - depends_on: - - db - labels: - com.centurylinklabs.watchtower.enable: true - homepage.group: Utilities - homepage.name: Bookstack - homepage.weight: 1 - homepage.icon: bookstack.png - homepage.href: https://bookstack.sectorq.eu - homepage.description: Books - homepage.server: my-docker - homepage.container: bookstack-app-1 - # homepage.widget.type: ${APPNAME} - # homepage.widget.url: https://${APPNAME}.sectorq.eu - # homepage.widget.key: ddfc91b29920082636da70cc677aec74c88a7666 - # homepage.widget.version: 2 - db: - image: lscr.io/linuxserver/mariadb - environment: - PUID: 0 - PGID: 0 - MYSQL_ROOT_PASSWORD: l4c1j4yd33Du5lo - TZ: Europe/Bratislava - MYSQL_DATABASE: bookstackapp - MYSQL_USER: bookstack - MYSQL_PASSWORD: l4c1j4yd33Du5lo - - volumes: - - /share/docker_data/bookstack/bookstack_db_data:/config - restart: always diff --git a/home-assistant/docker-compose.yaml b/home-assistant/docker-compose.yaml index e0ea7d4..23e675f 100644 --- a/home-assistant/docker-compose.yaml +++ b/home-assistant/docker-compose.yaml @@ -133,74 +133,7 @@ services: network_mode: host labels: com.centurylinklabs.watchtower.enable: true - grafana: - ports: - - 3007:3000 - container_name: grafana - image: grafana/grafana:latest - labels: - - com.centurylinklabs.watchtower.enable=true - - homepage.group=Smarthome - - homepage.name=Grafana - - homepage.weight=1 - - homepage.icon=grafana.png - - homepage.href=https://g.sectorq.eu - - homepage.description=Graphs - - homepage.server=my-docker - - homepage.container=grafana - # - homepage.widget.type=grafana - # - homepage.widget.url=https://g.sectorq.eu - # - homepage.widget.key=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9. - # environment: - # - GF_AUTH_DISABLE_LOGIN_FORM=true - # - GF_AUTH_ANONYMOUS_ENABLED=true - # - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin - # - GF_SECURITY_ALLOW_EMBEDDING=true - restart: unless-stopped - volumes: - - /share/docker_data/grafana/data:/var/lib/grafana - - /share/docker_data/grafana/certs:/certs - user: "0:0" - environment: - GF_LOG_FILTERS: rendering:debug - GF_RENDERING_SERVER_URL: http://renderer:8092/render - GF_RENDERING_CALLBACK_URL: http://grafana:3000/ - GF_AUTH_GENERIC_OAUTH_ENABLED: "true" - GF_AUTH_GENERIC_OAUTH_NAME: "authentik" - GF_AUTH_GENERIC_OAUTH_CLIENT_ID: "xc8AKsYOvHFmYnRjfnvt2YfgR5pg8Mlfc9YEqd3T" - GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET: "gb5ThPlyIUN2I8UPvIKAqQBoGFmTAb7tFxt5OiJQkAG6Ef2HDKksNOjWPJFfXiO22RuCnWuyzl6IMqPYO6QTa55EYfoN5N87enh5MOhTXjo2JTTnEL1eZhEI1Sw1vBO8" - GF_AUTH_GENERIC_OAUTH_SCOPES: "openid profile email" - GF_AUTH_GENERIC_OAUTH_AUTH_URL: "https://auth.sectorq.eu/application/o/authorize/" - GF_AUTH_GENERIC_OAUTH_TOKEN_URL: "https://auth.sectorq.eu/application/o/token/" - GF_AUTH_GENERIC_OAUTH_API_URL: "https://auth.sectorq.eu/application/o/userinfo/" - GF_AUTH_SIGNOUT_REDIRECT_URL: "https://auth.sectorq.eu/application/o/grafana/end-session/" - GF_SERVER_ROOT_URL: https://g.sectorq.eu/ - # Optionally enable auto-login (bypasses Grafana login screen) - GF_AUTH_OAUTH_AUTO_LOGIN: "true" - # Optionally map user groups to Grafana roles - GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: "contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'" - GF_INSTALL_PLUGINS: https://storage.googleapis.com/integration-artifacts/alexanderzobnin-zabbix-app/4.5.7/main/163fabf651b776bf70adc08fa41bec4f52645374/alexanderzobnin-zabbix-app-4.5.7%2B163fabf6.linux_amd64.zip;alexanderzobnin-zabbix-app - renderer: - image: grafana/grafana-image-renderer:latest - restart: unless-stopped - ports: - - 8092 - labels: - - com.centurylinklabs.watchtower.enable=true - - homepage.group=Smarthome - - homepage.name=Music Assistant - - homepage.weight=1 - - homepage.icon=music-assistant.png - - homepage.href=http://192.168.77.101:8095 - - homepage.description=Music assistant - - homepage.server=my-docker - - homepage.container=music-assistant-server - # espresense: - # image: espresense/espresense-companion - # ports: - # - 8267:8267 - # volumes: - # - ./data/espresense:/config/espresense + music-assistant-server: image: ghcr.io/music-assistant/server:latest # <<< Desired release version here (or use beta to get the latest beta version) container_name: music-assistant-server