diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd12985d2..18b01a1d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,14 +18,14 @@ jobs: - name: Build neo4j image uses: docker/build-push-action@v1.1.0 with: - repository: humanconnection/neo4j + repository: ocelotsocialnetwork/neo4j tags: latest path: neo4j/ push: false - name: Build backend base image uses: docker/build-push-action@v1.1.0 with: - repository: humanconnection/backend + repository: ocelotsocialnetwork/backend tags: build-and-test target: build-and-test path: backend/ @@ -33,14 +33,14 @@ jobs: - name: Build webapp base image uses: docker/build-push-action@v1.1.0 with: - repository: humanconnection/webapp + repository: ocelotsocialnetwork/webapp tags: build-and-test target: build-and-test path: webapp/ push: false - name: Lint backend - run: docker run --rm humanconnection/backend:build-and-test yarn run lint + run: docker run --rm ocelotsocialnetwork/backend:build-and-test yarn run lint - name: Lint webapp - run: docker run --rm humanconnection/webapp:build-and-test yarn run lint + run: docker run --rm ocelotsocialnetwork/webapp:build-and-test yarn run lint diff --git a/backend/.env.template b/backend/.env.template index 552e04ce2..fc9766478 100644 --- a/backend/.env.template +++ b/backend/.env.template @@ -24,5 +24,5 @@ AWS_ENDPOINT= AWS_REGION= AWS_BUCKET= -EMAIL_DEFAULT_SENDER="info@human-connection.org" -EMAIL_SUPPORT="support@human-connection.org" +EMAIL_DEFAULT_SENDER="devops@ocelot.social" +EMAIL_SUPPORT="devops@ocelot.social" diff --git a/backend/Dockerfile b/backend/Dockerfile index 554c59de8..6d3def015 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,5 @@ FROM node:12.19.0-alpine3.10 as base +LABEL Description="Backend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 4000 CMD ["yarn", "run", "start"] diff --git a/backend/src/config/metadata.js b/backend/src/config/metadata.js index 8e67e7ee7..68d353eea 100644 --- a/backend/src/config/metadata.js +++ b/backend/src/config/metadata.js @@ -1,7 +1,7 @@ export default { APPLICATION_NAME: 'ocelot.social', APPLICATION_SHORT_NAME: 'ocelot', - APPLICATION_DESCRIPTION: 'Ocelot Social Network', - ORGANIZATION_NAME: 'busFaktor() e.V.', - ORGANIZATION_JURISDICTION: 'Augsburg', + APPLICATION_DESCRIPTION: 'ocelot.social Community Network', + ORGANIZATION_NAME: 'ocelot.social Community', + ORGANIZATION_JURISDICTION: 'City of Angels', } diff --git a/backend/src/middleware/email/templates/wrongAccount.html b/backend/src/middleware/email/templates/wrongAccount.html index 0293e449d..cab4c91a6 100644 --- a/backend/src/middleware/email/templates/wrongAccount.html +++ b/backend/src/middleware/email/templates/wrongAccount.html @@ -104,7 +104,7 @@ Welcome image diff --git a/deployment/helm/ocelot.social/values.yaml b/deployment/helm/ocelot.social/values.yaml index 085c36fcb..74529ad3c 100644 --- a/deployment/helm/ocelot.social/values.yaml +++ b/deployment/helm/ocelot.social/values.yaml @@ -1,5 +1,5 @@ # domain is the user-facing domain. -domain: develop.human-connection.org +domain: develop.ocelot.social # commit is the latest github commit deployed. commit: 889a7cdd24dda04a139b2b77d626e984d6db6781 # dbInitialization runs the database initializations in a post-install hook. @@ -37,9 +37,9 @@ neo4jResourceLimitsMemory: "2G" # neo4jResourceLimitsMemory configures the memory available for requests. neo4jResourceRequestsMemory: "1G" # supportEmail is used for letsencrypt certs. -supportEmail: "devcom@human-connection.org" +supportEmail: "devops@ocelot.social" # smtpHost is the host for the mailserver. -smtpHost: "mailserver.human-connection.org" +smtpHost: "mailserver.ocelot.social" # smtpPort is the port to be used for the mailserver. smtpPort: \"25\" # jwtSecret is used to encode/decode a user's JWT for authentication @@ -50,4 +50,4 @@ privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4" mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E=" uploadsStorage: "25Gi" neo4jStorage: "5Gi" -developmentMailserverDomain: nitro-mailserver.human-connection.org +developmentMailserverDomain: mail.ocelot.social diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile index fd8912f3b..e08e482a0 100644 --- a/neo4j/Dockerfile +++ b/neo4j/Dockerfile @@ -1,4 +1,7 @@ FROM neo4j:3.5.14 +LABEL Description="Neo4J database of the Social Network ocelot.social with preinstalled database constraints and indices" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" +# community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment +# FROM neo4j:3.5.14-enterprise ARG BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 73bf10c49..5024ac2c6 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,4 +1,5 @@ FROM node:12.19.0-alpine3.10 as base +LABEL Description="Web Frontend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 3000 CMD ["yarn", "run", "start"] diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index b6c9c10a7..c58a7fcc9 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,4 +1,5 @@ FROM node:12.19.0-alpine3.10 as build +ABEL Description="Maintenance page of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)" EXPOSE 3000 CMD ["yarn", "run", "start"] diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js index b8b46b359..68d353eea 100644 --- a/webapp/constants/metadata.js +++ b/webapp/constants/metadata.js @@ -1,7 +1,7 @@ export default { APPLICATION_NAME: 'ocelot.social', APPLICATION_SHORT_NAME: 'ocelot', - APPLICATION_DESCRIPTION: 'Ocelot Social Network', - ORGANIZATION_NAME: 'buusFaktor() e.V.', - ORGANIZATION_JURISDICTION: 'Augsburg', + APPLICATION_DESCRIPTION: 'ocelot.social Community Network', + ORGANIZATION_NAME: 'ocelot.social Community', + ORGANIZATION_JURISDICTION: 'City of Angels', }