diff --git a/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml b/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml deleted file mode 100644 index 61d4b95650..0000000000 --- a/deployments/continuous-deployment-config/oc10_ocis_parallel/latest.yml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- name: continuous-deployment-oc10-ocis-parallel - server: - server_type: cx21 - image: ubuntu-20.04 - location: nbg1 - initial_ssh_key_names: - - owncloud-ocis@drone.owncloud.com - labels: - owner: wkloucek - for: oCIS-continuous-deployment-examples - rebuild: $REBUILD - rebuild_carry_paths: - - /var/lib/docker/volumes/ocis_certs - - domains: - - "*.oc10-ocis-parallel.latest.owncloud.works" - - vars: - os_env_umask: 022 # https://github.com/dev-sec/ansible-collection-hardening/blob/master/roles/os_hardening/README.md#variables - ssh_authorized_keys: - - https://github.com/butonic.keys - - https://github.com/fschade.keys - - https://github.com/kulmann.keys - - https://github.com/micbar.keys - - https://github.com/wkloucek.keys - docker_compose_projects: - - name: ocis - git_url: https://github.com/owncloud/ocis.git - ref: master - docker_compose_path: deployments/examples/oc10_ocis_parallel - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: latest - CLOUD_DOMAIN: cloud.oc10-ocis-parallel.latest.owncloud.works - KEYCLOAK_DOMAIN: keycloak.oc10-ocis-parallel.latest.owncloud.works - LDAP_MANAGER_DOMAIN: ldap.oc10-ocis-parallel.latest.owncloud.works - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - - name: monitoring - git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git - ref: master - env: - NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.oc10-ocis-parallel.latest.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: cloud.oc10-ocis-parallel.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-oc10-ocis-parallel-latest diff --git a/deployments/continuous-deployment-config/ocis_hello/latest.yml b/deployments/continuous-deployment-config/ocis_hello/latest.yml deleted file mode 100644 index 9ad391f6cb..0000000000 --- a/deployments/continuous-deployment-config/ocis_hello/latest.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -- name: continuous-deployment-ocis-hello-latest - server: - server_type: cx21 - image: ubuntu-20.04 - location: nbg1 - initial_ssh_key_names: - - owncloud-ocis@drone.owncloud.com - labels: - owner: wkloucek - for: oCIS-continuous-deployment-examples - rebuild: $REBUILD - rebuild_carry_paths: - - /var/lib/docker/volumes/ocis_certs - - domains: - - "*.ocis-hello.latest.owncloud.works" - - vars: - ssh_authorized_keys: - - https://github.com/butonic.keys - - https://github.com/fschade.keys - - https://github.com/kulmann.keys - - https://github.com/micbar.keys - - https://github.com/wkloucek.keys - docker_compose_projects: - - name: ocis - git_url: https://github.com/owncloud/ocis.git - ref: master - docker_compose_path: deployments/examples/ocis_hello - env: - INSECURE: "false" - TRAEFIK_ACME_MAIL: wkloucek@owncloud.com - OCIS_DOCKER_TAG: latest - OCIS_DOMAIN: ocis.ocis-hello.latest.owncloud.works - DEMO_USERS: "true" - COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml - - name: monitoring - git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git - ref: master - env: - NETWORK_NAME: ocis-net - TELEMETRY_SERVE_DOMAIN: telemetry.ocis-hello.latest.owncloud.works - JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443 - TELEGRAF_SPECIFIC_CONFIG: ocis_single_container - OCIS_URL: ocis.ocis-hello.latest.owncloud.works - OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-hello-latest diff --git a/docs/ocis/deployment/continuous_deployment.md b/docs/ocis/deployment/continuous_deployment.md index 1bc15497fd..a0979cce91 100644 --- a/docs/ocis/deployment/continuous_deployment.md +++ b/docs/ocis/deployment/continuous_deployment.md @@ -94,34 +94,6 @@ Credentials: - Keycloak: [keycloak.ocis-keycloak.released.owncloud.works](https://keycloak.ocis-keycloak.released.owncloud.works) - Keycloak account management: [keycloak.ocis-keycloak.released.owncloud.works/realms/oCIS/account/#/](https://keycloak.ocis-keycloak.released.owncloud.works/realms/oCIS/account/#/) -# Parallel deployment of oC10 and oCIS - -Credentials: - -- oC10 / oCIS: see [default demo users]({{< ref "../getting-started/demo-users/" >}}) -- Keycloak: - - username: admin - - password: admin -- LDAP management: - - username: cn=admin,dc=owncloud,dc=com - - password: admin - -## Latest - -- oC10 / oCIS: [cloud.oc10-ocis-parallel.latest.owncloud.works](https://cloud.oc10-ocis-parallel.latest.owncloud.works) -- LDAP management: [ldap.oc10-ocis-parallel.latest.owncloud.works](https://ldap.oc10-ocis-parallel.latest.owncloud.works) -- Keycloak: [keycloak.oc10-ocis-parallel.latest.owncloud.works](https://keycloak.oc10-ocis-parallel.latest.owncloud.works) - -# oCIS with Hello extension - -Credentials: - -- oCIS: see [default demo users]({{< ref "../getting-started/demo-users/" >}}) - -## Latest - -- oCIS: [ocis.ocis-hello.latest.owncloud.works](https://ocis.ocis-hello.latest.owncloud.works) - # oCIS with S3 storage backend (MinIO) Credentials: