-
Notifications
You must be signed in to change notification settings - Fork 189
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #800 from owncloud/bridge-deployment-fixes
using special powers to merge as requested by @IljaN
- Loading branch information
Showing
13 changed files
with
320 additions
and
389 deletions.
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -1,53 +1,2 @@ | ||
| # Deployment scenario ocis with external konnectd service on separate node and traefik as reverse proxy | ||
|
|
||
| ## Setup on ocis server | ||
|
|
||
| * Clone ocis repository | ||
|
|
||
| `git clone https://github.com/owncloud/ocis.git` | ||
|
|
||
| * Copy example sub folder for ocisnode to /opt | ||
|
|
||
| `cp deployment/examples/ocis_external_konnectd/ocisnode /opt/` | ||
|
|
||
| * Overwrite OCIS_DOMAIN and IDP_DOMAIN in .env with your-ocis.domain.com and your-idp.domain.com | ||
|
|
||
| `sed -i 's/ocis.domain.com/your-ocis.domain.com/g' /opt/ocisnode/.env` | ||
|
|
||
| `sed -i 's/idp.domain.com/your-idp.domain.com/g' /opt/ocisnode/.env` | ||
|
|
||
| * Change into deployment folder | ||
|
|
||
| `cd /opt/ocisnode` | ||
|
|
||
| * Start application stack | ||
|
|
||
| `docker-compose up -d` | ||
|
|
||
| ## Setup on idp server | ||
|
|
||
| * Clone ocis repository | ||
|
|
||
| `git clone https://github.com/owncloud/ocis.git` | ||
|
|
||
| * Copy example sub folder for idpnode to /opt | ||
|
|
||
| `cp deployment/examples/ocis_external_konnectd/idpnode /opt/` | ||
|
|
||
| * Overwrite OCIS_DOMAIN and IDP_DOMAIN in .env with your-ocis.domain.com and your-idp.domain.com | ||
|
|
||
| `sed -i 's/ocis.domain.com/your-ocis.domain.com/g' /opt/idpnode/.env` | ||
|
|
||
| `sed -i 's/idp.domain.com/your-idp.domain.com/g' /opt/idpnode/.env` | ||
|
|
||
| * Overwrite redirect uri with your-ocis.domain.com in identifier-registration.yml | ||
|
|
||
| `sed -i 's/ocis.domain.com/your-ocis.domain.com/g' /opt/idpnode/config/identifier-registration.yml` | ||
|
|
||
| * Change into deployment folder | ||
|
|
||
| `cd /opt/idpnode` | ||
|
|
||
| * Start application stack | ||
|
|
||
| `docker-compose up -d` | ||
| Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_external_konnectd/) | ||
| for instructions on how to deploy this scenario. |
This file contains 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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| COMPOSE_PROJECT_NAME=bridge | ||
| OCIS_DOMAIN=ocis.domain.com | ||
| OC10_DOMAIN=oc10.domain.com | ||
| OCIS_DOMAIN=ocis.example.org | ||
| OC10_DOMAIN=oc10.example.org | ||
| INSECURE=false |
This file contains 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 |
|---|---|---|
| @@ -1,30 +1,2 @@ | ||
| # Deployment scenario ocis with oc10 backend and traefik as reverse proxy | ||
|
|
||
| ## Setup on server | ||
|
|
||
| * Clone ocis repository | ||
|
|
||
| `git clone https://github.com/owncloud/ocis.git` | ||
|
|
||
| * Copy example folder to /opt | ||
| `cp deployment/examples/ocis_oc10_backend /opt/` | ||
|
|
||
| * Overwrite OCIS_DOMAIN and OC10_DOMAIN in .env with your-ocis.domain.com and your-oc10.domain.com | ||
|
|
||
| `sed -i 's/ocis.domain.com/your-ocis.domain.com/g' /opt/ocis_oc10_backend/.env` | ||
|
|
||
| `sed -i 's/oc10.domain.com/your-oc10.domain.com/g' /opt/ocis_oc10_backend/.env` | ||
|
|
||
| * Overwrite redirect uris with your-ocis.domain.com and your-oc10.domain.com in identifier-registration.yml | ||
|
|
||
| `sed -i 's/ocis.domain.com/your-ocis.domain.com/g' /opt/ocis_oc10_backend/ocis/identifier-registration.yml` | ||
|
|
||
| `sed -i 's/oc10.domain.com/your-oc10.domain.com/g' /opt/ocis_oc10_backend/ocis/identifier-registration.yml` | ||
|
|
||
| * Change into deployment folder | ||
|
|
||
| `cd /opt/ocis_oc10_backend` | ||
|
|
||
| * Start application stack | ||
|
|
||
| `docker-compose up -d` | ||
| Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_oc10_backend/) | ||
| for instructions on how to deploy this scenario. |
This file contains 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
This file contains 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
This file contains 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,11 @@ | ||
| FROM owncloud/ocis:latest | ||
|
|
||
| ARG OCIS_DOMAIN | ||
| ENV OCIS_DOMAIN $OCIS_DOMAIN | ||
| ARG OC10_DOMAIN | ||
| ENV OC10_DOMAIN $OC10_DOMAIN | ||
|
|
||
| ADD config /config | ||
| RUN sed -i "s/ocis.example.org/${OCIS_DOMAIN}/g" /config/web/config.json \ | ||
| && sed -i "s/ocis.example.org/${OCIS_DOMAIN}/g" /config/identifier-registration.yaml \ | ||
| && sed -i "s/oc10.example.org/${OC10_DOMAIN}/g" /config/identifier-registration.yaml \ |
This file contains 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
61 changes: 61 additions & 0 deletions
61
deployments/examples/ocis_oc10_backend/ocis/config/proxy-config.json
This file contains 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,61 @@ | ||
| { | ||
| "HTTP": { | ||
| "Namespace": "works.owncloud" | ||
| }, | ||
| "policy_selector": { | ||
| "static": { | ||
| "policy": "oc10" | ||
| } | ||
| }, | ||
| "policies": [ | ||
| { | ||
| "name": "oc10", | ||
| "routes": [ | ||
| { | ||
| "endpoint": "/", | ||
| "backend": "http://localhost:9100" | ||
| }, | ||
| { | ||
| "endpoint": "/.well-known/", | ||
| "backend": "http://localhost:9130" | ||
| }, | ||
| { | ||
| "endpoint": "/konnect/", | ||
| "backend": "http://localhost:9130" | ||
| }, | ||
| { | ||
| "endpoint": "/signin/", | ||
| "backend": "http://localhost:9130" | ||
| }, | ||
| { | ||
| "endpoint": "/ocs/", | ||
| "backend": "http://owncloud:8080", | ||
| "apache-vhost": true | ||
| }, | ||
| { | ||
| "endpoint": "/remote.php/", | ||
| "backend": "http://owncloud:8080", | ||
| "apache-vhost": true | ||
| }, | ||
| { | ||
| "endpoint": "/dav/", | ||
| "backend": "http://owncloud:8080", | ||
| "apache-vhost": true | ||
| }, | ||
| { | ||
| "endpoint": "/webdav/", | ||
| "backend": "http://owncloud:8080", | ||
| "apache-vhost": true | ||
| }, | ||
| { | ||
| "endpoint": "/status.php", | ||
| "backend": "http://owncloud:8080" | ||
| }, | ||
| { | ||
| "endpoint": "/index.php/", | ||
| "backend": "http://owncloud:8080" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
39 changes: 39 additions & 0 deletions
39
deployments/examples/ocis_oc10_backend/ocis/config/web/config.json
This file contains 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,39 @@ | ||
| { | ||
| "server": "https://ocis.example.org", | ||
| "theme": "owncloud", | ||
| "version": "0.1.0", | ||
| "openIdConnect": { | ||
| "metadata_url": "https://ocis.example.org/.well-known/openid-configuration", | ||
| "authority": "https://ocis.example.org", | ||
| "client_id": "phoenix", | ||
| "response_type": "code", | ||
| "scope": "openid profile email" | ||
| }, | ||
| "applications": [ | ||
| { | ||
| "title": { | ||
| "en": "Classic Design", | ||
| "de": "Klassisches ownCloud" | ||
| }, | ||
| "icon": "switch_ui", | ||
| "url": "https://ocis.example.org", | ||
| "target": "_self" | ||
| }, | ||
| { | ||
| "title": { | ||
| "en": "Settings", | ||
| "de": "Einstellungen" | ||
| }, | ||
| "icon": "application", | ||
| "url": "https://ocis.example.org/index.php/settings/personal", | ||
| "target": "_self", | ||
| "menu": "user" | ||
| } | ||
| ], | ||
| "apps": [ | ||
| "files", | ||
| "draw-io", | ||
| "markdown-editor", | ||
| "media-viewer" | ||
| ] | ||
| } |
Oops, something went wrong.