-
Notifications
You must be signed in to change notification settings - Fork 1
Juan/lasuite #17
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
Open
yamijuan
wants to merge
27
commits into
main
Choose a base branch
from
juan/lasuite
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Juan/lasuite #17
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
91ad9c6
first commit
yamijuan 27e0051
Merge branch 'main' of github.com:Monadical-SAS/selfhostyourtech into…
yamijuan c92c0a4
env first try, missing ports
yamijuan 13661a5
added ports
yamijuan e5160b4
nginx tryout
yamijuan 4e5c47b
nginx tryout
yamijuan 8238a0c
default network
yamijuan 50949ca
postgress and minio port
yamijuan 08c492e
ngex sock
yamijuan 5d959d8
minio steup
yamijuan 74ede46
minio steup
yamijuan 12152b1
add more env vars to minio
yamijuan 308e01a
add more env vars to minio
yamijuan 00015d7
add more env vars to minio
yamijuan ff7d9bc
trynna fix nginx
yamijuan f0b3cab
trynna fix nginx
yamijuan 330dc18
trynna fix nginx again
yamijuan 650ceef
added env to ngnx
yamijuan 3d5982d
changed nv vars in ngix
yamijuan 22a043c
changed nv vars in ngix
yamijuan e0583f5
changed to templates
yamijuan 798ffb7
replace full dir'
yamijuan d5a7cc9
volumes
yamijuan 59b8485
volumes
yamijuan 7e5cf16
use nginx directly instead of nginxproxy
tito 0b6bd2d
added one more scope
yamijuan 557ad47
retrying
yamijuan File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| helper scripts go here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| service state and logs go here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| helper scripts go here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| service state and logs go here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| services: | ||
| postgresql: | ||
| image: postgres:16 | ||
| healthcheck: | ||
| test: [ "CMD", "pg_isready", "-q", "-U", "docs", "-d", "docs" ] | ||
| interval: 1s | ||
| timeout: 2s | ||
| retries: 300 | ||
| env_file: | ||
| - .env | ||
| environment: | ||
| - PGDATA=/var/lib/postgresql/data/pgdata | ||
| volumes: | ||
| - ./data/databases/backend:/var/lib/postgresql/data/pgdata | ||
|
|
||
| redis: | ||
| image: redis:5 | ||
|
|
||
| backend: | ||
| image: lasuite/impress-backend:latest | ||
| user: ${DOCKER_USER:-1000} | ||
| restart: always | ||
| environment: | ||
| - DJANGO_CONFIGURATION=Production | ||
| # Common variables | ||
| - DOCS_HOST=${DOCS_HOST} | ||
| - S3_HOST=${S3_HOST} | ||
| - MINIO_HOST=${MINIO_HOST} | ||
| - BACKEND_HOST=${BACKEND_HOST} | ||
| - FRONTEND_HOST=${FRONTEND_HOST} | ||
| - BUCKET_NAME=docs-media-storage | ||
| - REALM_NAME=docs | ||
| # Backend variables## Django | ||
| - DJANGO_ALLOWED_HOSTS=${DOCS_HOST} | ||
| - DJANGO_SECRET_KEY=${DJANGO_SECRET_KEY} | ||
| - DJANGO_SETTINGS_MODULE=impress.settings | ||
| - DJANGO_CONFIGURATION=Production | ||
|
|
||
| # Logging | ||
| # Set to DEBUG level for dev only | ||
| - LOGGING_LEVEL_HANDLERS_CONSOLE=ERROR | ||
| - LOGGING_LEVEL_LOGGERS_ROOT=INFO | ||
| - LOGGING_LEVEL_LOGGERS_APP=INFO | ||
|
|
||
| # Python | ||
| - PYTHONPATH=/app | ||
|
|
||
| - DJANGO_EMAIL_HOST=${DJANGO_EMAIL_HOST} | ||
| - DJANGO_EMAIL_HOST_USER=${DJANGO_EMAIL_HOST_USER} | ||
| - DJANGO_EMAIL_HOST_PASSWORD=${DJANGO_EMAIL_HOST_PASSWORD} | ||
| - DJANGO_EMAIL_PORT=${DJANGO_EMAIL_PORT} | ||
| - DJANGO_EMAIL_FROM=${DJANGO_EMAIL_FROM} | ||
|
|
||
| #DJANGO_EMAIL_USE_TLS=true # A flag to enable or disable TLS for email sending. | ||
| #DJANGO_EMAIL_USE_SSL=true # A flag to enable or disable SSL for email sending. | ||
|
|
||
| - DJANGO_EMAIL_BRAND_NAME="Monadical" | ||
| # DJANGO_EMAIL_LOGO_IMG="https://${DOCS_HOST}/assets/logo-suite-numerique.png" | ||
|
|
||
| # Media | ||
| - AWS_S3_ENDPOINT_URL=https://${S3_HOST} | ||
| - AWS_S3_ACCESS_KEY_ID=${AWS_S3_ACCESS_KEY_ID} | ||
| - AWS_S3_SECRET_ACCESS_KEY=${AWS_S3_SECRET_ACCESS_KEY} | ||
| - AWS_STORAGE_BUCKET_NAME=${BUCKET_NAME} | ||
| - MEDIA_BASE_URL=https://${DOCS_HOST} | ||
|
|
||
| # OIDC | ||
| - OIDC_OP_JWKS_ENDPOINT=${OIDC_OP_JWKS_ENDPOINT} | ||
| - OIDC_OP_AUTHORIZATION_ENDPOINT=${OIDC_OP_AUTHORIZATION_ENDPOINT} | ||
| - OIDC_OP_TOKEN_ENDPOINT=${OIDC_OP_TOKEN_ENDPOINT} | ||
| - OIDC_OP_USER_ENDPOINT=${OIDC_OP_USER_ENDPOINT} | ||
| - OIDC_OP_LOGOUT_ENDPOINT=${OIDC_OP_LOGOUT_ENDPOINT} | ||
| - OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID} | ||
| - OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET} | ||
| - OIDC_RP_SIGN_ALGO=RS256 | ||
| - OIDC_RP_SCOPES="openid email" | ||
| #USER_OIDC_FIELD_TO_SHORTNAME | ||
| #USER_OIDC_FIELDS_TO_FULLNAME | ||
|
|
||
| - LOGIN_REDIRECT_URL=https://${DOCS_HOST} | ||
| - LOGIN_REDIRECT_URL_FAILURE=https://${DOCS_HOST} | ||
| - LOGOUT_REDIRECT_URL=https://${DOCS_HOST} | ||
| - OIDC_REDIRECT_ALLOWED_HOSTS=["https://${DOCS_HOST}"] | ||
|
|
||
| # AI | ||
| - AI_FEATURE_ENABLED=true # is false by default | ||
| - AI_BASE_URL=${AI_BASE_URL} | ||
| - AI_API_KEY=${AI_API_KEY} | ||
| - AI_MODEL=${AI_MODEL} # e.g. llama | ||
| # Frontend | ||
| #FRONTEND_THEME=mytheme | ||
| #FRONTEND_CSS_URL=https://storage.yourdomain.tld/themes/custom.css | ||
| #FRONTEND_FOOTER_FEATURE_ENABLED=true | ||
| #FRONTEND_URL_JSON_FOOTER=https://docs.domain.tld/contents/footer-demo.json | ||
|
|
||
| env_file: | ||
| - .env | ||
| healthcheck: | ||
| test: [ "CMD", "python", "manage.py", "check" ] | ||
| interval: 15s | ||
| timeout: 30s | ||
| retries: 20 | ||
| start_period: 10s | ||
| depends_on: | ||
| postgresql: | ||
| condition: service_healthy | ||
| restart: true | ||
| redis: | ||
| condition: service_started | ||
|
|
||
| y-provider: | ||
| image: lasuite/impress-y-provider:latest | ||
| user: ${DOCKER_USER:-1000} | ||
| entrypoint: | ||
| - Y_PROVIDER_API_KEY=${Y_PROVIDER_API_KEY} | ||
| - COLLABORATION_SERVER_SECRET=${COLLABORATION_SERVER_SECRET} | ||
| - COLLABORATION_SERVER_ORIGIN=https://${DOCS_HOST} | ||
| - COLLABORATION_API_URL=https://${DOCS_HOST}/collaboration/api/ | ||
| - COLLABORATION_WS_URL=wss://${DOCS_HOST}/collaboration/ws/ | ||
| - COLLABORATION_BACKEND_BASE_URL=https://${DOCS_HOST} | ||
| - COLLABORATION_LOGGING=true | ||
|
|
||
| frontend: | ||
| image: lasuite/impress-frontend:latest | ||
| user: "101" | ||
| env_file: | ||
| - .env | ||
| # Uncomment and set your values if using our nginx proxy example | ||
| #environment: | ||
| # - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy | ||
| # - VIRTUAL_PORT=8083 # used by nginx proxy | ||
| # - LETSENCRYPT_HOST=${DOCS_HOST} # used by lets encrypt to generate TLS certificate | ||
yamijuan marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| volumes: | ||
| - ./default.conf.template:/etc/nginx/templates/default.conf.template | ||
| depends_on: | ||
| backend: | ||
| condition: service_healthy | ||
|
|
||
| # Uncomment if using our nginx proxy example | ||
| # networks: | ||
| # - proxy-tier | ||
| # - default | ||
|
|
||
| # Uncomment if using our nginx proxy example | ||
| #networks: | ||
| # proxy-tier: | ||
| # external: true | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| ## Django | ||
| DJANGO_ALLOWED_HOSTS=${DOCS_HOST} | ||
| DJANGO_SECRET_KEY=<generate a random key> | ||
| DJANGO_SETTINGS_MODULE=impress.settings | ||
| DJANGO_CONFIGURATION=Production | ||
|
|
||
| # Logging | ||
| # Set to DEBUG level for dev only | ||
| LOGGING_LEVEL_HANDLERS_CONSOLE=ERROR | ||
| LOGGING_LEVEL_LOGGERS_ROOT=INFO | ||
| LOGGING_LEVEL_LOGGERS_APP=INFO | ||
|
|
||
| # Python | ||
| PYTHONPATH=/app | ||
|
|
||
| DJANGO_EMAIL_HOST=<smtp host> | ||
| DJANGO_EMAIL_HOST_USER=<smtp user> | ||
| DJANGO_EMAIL_HOST_PASSWORD=<smtp password> | ||
| DJANGO_EMAIL_PORT=<smtp port> | ||
| DJANGO_EMAIL_FROM=<your email address> | ||
|
|
||
| #DJANGO_EMAIL_USE_TLS=true # A flag to enable or disable TLS for email sending. | ||
| #DJANGO_EMAIL_USE_SSL=true # A flag to enable or disable SSL for email sending. | ||
|
|
||
| DJANGO_EMAIL_BRAND_NAME="La Suite Numérique" | ||
| DJANGO_EMAIL_LOGO_IMG="https://${DOCS_HOST}/assets/logo-suite-numerique.png" | ||
|
|
||
| # Media | ||
| AWS_S3_ENDPOINT_URL=https://${S3_HOST} | ||
| AWS_S3_ACCESS_KEY_ID=<s3 access key> | ||
| AWS_S3_SECRET_ACCESS_KEY=<s3 secret key> | ||
| AWS_STORAGE_BUCKET_NAME=${BUCKET_NAME} | ||
| MEDIA_BASE_URL=https://${DOCS_HOST} | ||
|
|
||
| # OIDC | ||
| OIDC_OP_JWKS_ENDPOINT=https://${KEYCLOAK_HOST}/realms/${REALM_NAME}/protocol/openid-connect/certs | ||
| OIDC_OP_AUTHORIZATION_ENDPOINT=https://${KEYCLOAK_HOST}/realms/${REALM_NAME}/protocol/openid-connect/auth | ||
| OIDC_OP_TOKEN_ENDPOINT=https://${KEYCLOAK_HOST}/realms/${REALM_NAME}/protocol/openid-connect/token | ||
| OIDC_OP_USER_ENDPOINT=https://${KEYCLOAK_HOST}/realms/${REALM_NAME}/protocol/openid-connect/userinfo | ||
| OIDC_OP_LOGOUT_ENDPOINT=https://${KEYCLOAK_HOST}/realms/${REALM_NAME}/protocol/openid-connect/logout | ||
| OIDC_RP_CLIENT_ID=<client_id> | ||
| OIDC_RP_CLIENT_SECRET=<client secret> | ||
| OIDC_RP_SIGN_ALGO=RS256 | ||
| OIDC_RP_SCOPES="openid email" | ||
| #USER_OIDC_FIELD_TO_SHORTNAME | ||
| #USER_OIDC_FIELDS_TO_FULLNAME | ||
|
|
||
| LOGIN_REDIRECT_URL=https://${DOCS_HOST} | ||
| LOGIN_REDIRECT_URL_FAILURE=https://${DOCS_HOST} | ||
| LOGOUT_REDIRECT_URL=https://${DOCS_HOST} | ||
|
|
||
| OIDC_REDIRECT_ALLOWED_HOSTS=["https://${DOCS_HOST}"] | ||
|
|
||
| # AI | ||
| #AI_FEATURE_ENABLED=true # is false by default | ||
| #AI_BASE_URL=https://openaiendpoint.com | ||
| #AI_API_KEY=<API key> | ||
| #AI_MODEL=<model used> e.g. llama | ||
|
|
||
| # Frontend | ||
| #FRONTEND_THEME=mytheme | ||
| #FRONTEND_CSS_URL=https://storage.yourdomain.tld/themes/custom.css | ||
| #FRONTEND_FOOTER_FEATURE_ENABLED=true | ||
| #FRONTEND_URL_JSON_FOOTER=https://docs.domain.tld/contents/footer-demo.json |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| DOCS_HOST=docs.domain.tld | ||
| S3_HOST=storage.domain.tld | ||
| MINIO_HOST=storage.domain.tld | ||
| BACKEND_HOST=backend | ||
| FRONTEND_HOST=frontend | ||
| BUCKET_NAME=docs-media-storage | ||
| REALM_NAME=docs |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| Y_PROVIDER_API_KEY=<generate a random key> | ||
| COLLABORATION_SERVER_SECRET=<generate a random key> | ||
| COLLABORATION_SERVER_ORIGIN=https://${DOCS_HOST} | ||
| COLLABORATION_API_URL=https://${DOCS_HOST}/collaboration/api/ | ||
| COLLABORATION_WS_URL=wss://${DOCS_HOST}/collaboration/ws/ | ||
| COLLABORATION_BACKEND_BASE_URL=https://${DOCS_HOST} | ||
| COLLABORATION_LOGGING=true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| config files go here |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| config files go here |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.