add OIDC (DRAWBRIDGED, NEED A LICENSE KEY)

[ci skip]

.env.sample

@@ -44,3 +44,8 @@ COMPOSE_FILE="compose.yml"
 #MS_GRAPH_CLIENT_ID=
 #COMPOSE_FILE="$COMPOSE_FILE:compose.microsoft.yml"
 #SECRET_MS_GRAPH_CLIENT_SECRET_VERSION=v1
+
+## Enable OIDC (jk you need a license key)
+#COMPOSE_FILE="${COMPOSE_FILE}:compose.oidc.yml"
+#OIDCDB_PASSWORD_VERSION=v1
+#SAML_ADMINS=user@example.com

README.md

@@ -6,7 +6,7 @@ The open-source Calendly alternative.
 
 * **Category**: Apps
 * **Status**: 1, alpha
-* **Image**: [`3wordchant/calendso`](https://hub.docker.com/r/3wordchant/calendso), 4, own
+* **Image**: [`calcom/calendso`](https://hub.docker.com/r/calcom/cal.com), 4, upstream
 * **Healthcheck**: No
 * **Backups**: No
 * **Email**: Yes

abra.sh

@@ -1 +1 @@
-export ENTRYPOINT_CONF_VERSION=v8
+export ENTRYPOINT_CONF_VERSION=v9

compose.google.yml

@@ -1,5 +1,6 @@
 ---
-# Google calendar, see https://docs.calendso.com/docs/integrations/google
+# Google calendar, see
+# https://github.com/calcom/cal.com#obtaining-the-google-api-credentials
 version: "3.8"
 
 services:

compose.microsoft.yml

@@ -0,0 +1,17 @@
+---
+# Microsoft calendar, see
+# https://github.com/calcom/cal.com#obtaining-microsoft-graph-client-id-and-secret
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - MS_GRAPH_CLIENT_SECRET_FILE=/run/secrets/ms_graph_client_secret
+      - MS_GRAPH_CLIENT_ID
+    secrets:
+      - ms_graph_client_secret
+
+secrets:
+  ms_graph_client_secret:
+    external: true
+    name: ${STACK_NAME}_ms_graph_client_secret_${SECRET_MS_GRAPH_CLIENT_SECRET_VERSION}

compose.oidc.yml

@@ -0,0 +1,40 @@
+---
+version: "3.8"
+
+services:
+  app:
+    environment:
+      - SAML_ADMINS
+      - OIDCDB_USER=oidc
+      - OIDCDB_PASSWORD_FILE=/run/secrets/oidcdb_password
+      - OIDCDB_HOST=oidcdb
+      - OIDC_DB=oidc
+    secrets:
+      - oidcdb_password
+
+  oidcdb:
+    image: "postgres:13-alpine"
+    networks:
+      - backend
+    secrets:
+      - oidcdb_password
+    environment:
+      - POSTGRES_DB=oidc
+      - POSTGRES_USER=oidc
+      - POSTGRES_PASSWORD_FILE=/run/secrets/oidcdb_password
+    volumes:
+      - "oidc_postgres:/var/lib/postgresql/data"
+    deploy:
+      labels:
+          backupbot.backup: "true"
+          backupbot.backup.pre-hook: 'bash -c "mkdir -p /tmp/backup/ && PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup/backup.sql"'
+          backupbot.backup.post-hook: "rm -rf /tmp/backup"
+          backupbot.backup.path: "/tmp/backup/"
+
+secrets:
+  oidcdb_password:
+    external: true
+    name: ${STACK_NAME}_oidcdb_password_${OIDCDB_PASSWORD_VERSION}
+
+volumes:
+  oidc_postgres:

compose.yml

@@ -47,7 +47,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
         - "traefik.http.routers.${STACK_NAME}.service=${STACK_NAME}"
-        - "coop-cloud.${STACK_NAME}.version=0.3.0+v3.1.4"
+        - "coop-cloud.${STACK_NAME}.version=0.4.0+v3.1.4"
         ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
@@ -65,8 +65,6 @@ services:
       - backend
     secrets:
       - db_password
-    networks:
-      - backend
     environment:
       - POSTGRES_DB=calendso
       - POSTGRES_USER=calendso

entrypoint.sh

@@ -27,13 +27,17 @@ file_env() {
 
 load_vars() {
 	file_env "POSTGRES_PASSWORD"
-	file_env "GOOGLE_API_CREDENTIALS"
-	file_env "ZOOM_CLIENT_SECRET"
 	file_env "EMAIL_SERVER_PASSWORD"
 	file_env "NEXTAUTH_SECRET"
 	file_env "CALENDSO_ENCRYPTION_KEY"
 
+	file_env "GOOGLE_API_CREDENTIALS"
+	file_env "MS_GRAPH_CLIENT_SECRET"
+	file_env "ZOOM_CLIENT_SECRET"
+  file_env "OIDCDB_PASSWORD"
+
 	export "DATABASE_URL=postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST:5432/$POSTGRES_DB"
+  export "SAML_DATABASE_URL=postgresql://$OIDCDB_USER:$OIDCDB_PASSWORD@$OIDCDB_HOST:5432/$OIDC_DB"
 }
 
 main() {