Compare commits
2 Commits
0.3.0+1.9.
...
0.4.0+1.9.
| Author | SHA1 | Date | |
|---|---|---|---|
| 90d5d3fc18 | |||
| b282386419 |
13
.env.sample
13
.env.sample
@ -1,26 +1,27 @@
|
|||||||
TYPE=codimd
|
TYPE=hedgedoc
|
||||||
|
|
||||||
DOMAIN=codimd.example.com
|
DOMAIN=hedgedoc.example.com
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
#EXTRA_DOMAINS=', `www.codimd.example.com`'
|
#EXTRA_DOMAINS=', `www.hedgedoc.example.com`'
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
|
|
||||||
COMPOSE_FILE="compose.yml"
|
COMPOSE_FILE="compose.yml"
|
||||||
|
|
||||||
# OAuth, see https://hackmd.io/@codimd/codimd-generic-oauth-2
|
# OAuth, see https://docs.hedgedoc.org/guides/auth/keycloak/
|
||||||
|
|
||||||
#COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
|
#COMPOSE_FILE="$COMPOSE_FILE:compose.oauth.yml"
|
||||||
#CMD_OAUTH2_PROVIDERNAME="Keycloak"
|
#CMD_OAUTH2_PROVIDERNAME="Keycloak"
|
||||||
#CMD_OAUTH2_BASEURL="https://keycloak.example.com/realms/realmname/protocol/openid-connect/"
|
#CMD_OAUTH2_CLIENT_ID="hedgedoc"
|
||||||
#CMD_OAUTH2_CLIENT_ID="codimd"
|
|
||||||
#CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
|
#CMD_OAUTH2_AUTHORIZATION_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/auth"
|
||||||
#CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
|
#CMD_OAUTH2_TOKEN_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/token"
|
||||||
#CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
|
#CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
|
||||||
#CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
|
#CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR=ocs.data.id
|
||||||
#CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
|
#CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR=ocs.data.display-name
|
||||||
#CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
|
#CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR=ocs.data.email
|
||||||
|
#CMD_OAUTH2_PROVIDERNAME=Keycloak
|
||||||
|
#CMD_OAUTH2_SCOPE="openid email profile"
|
||||||
#
|
#
|
||||||
#SECRET_OAUTH_KEY_VERSION=v1
|
#SECRET_OAUTH_KEY_VERSION=v1
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,6 @@ services:
|
|||||||
app:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- CMD_OAUTH2_PROVIDERNAME
|
- CMD_OAUTH2_PROVIDERNAME
|
||||||
- CMD_OAUTH2_BASEURL
|
|
||||||
- CMD_OAUTH2_CLIENT_ID
|
- CMD_OAUTH2_CLIENT_ID
|
||||||
- CMD_OAUTH2_CLIENT_SECRET_FILE=/run/secrets/oauth_key
|
- CMD_OAUTH2_CLIENT_SECRET_FILE=/run/secrets/oauth_key
|
||||||
- CMD_OAUTH2_AUTHORIZATION_URL
|
- CMD_OAUTH2_AUTHORIZATION_URL
|
||||||
@ -14,6 +13,7 @@ services:
|
|||||||
- CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
|
- CMD_OAUTH2_USER_PROFILE_USERNAME_ATTR
|
||||||
- CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
|
- CMD_OAUTH2_USER_PROFILE_DISPLAY_NAME_ATTR
|
||||||
- CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
|
- CMD_OAUTH2_USER_PROFILE_EMAIL_ATTR
|
||||||
|
- CMD_OAUTH2_SCOPE
|
||||||
secrets:
|
secrets:
|
||||||
- oauth_key
|
- oauth_key
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- coop-cloud.${STACK_NAME}.version=0.3.0+1.9.3
|
- coop-cloud.${STACK_NAME}.version=0.4.0+1.9.3
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
|
test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -61,7 +61,7 @@ services:
|
|||||||
retries: 10
|
retries: 10
|
||||||
start_period: 1m
|
start_period: 1m
|
||||||
db:
|
db:
|
||||||
image: postgres:11.15-alpine
|
image: postgres:11.16-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=codimd
|
- POSTGRES_USER=codimd
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
|||||||
Reference in New Issue
Block a user