Skip to content
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

Rename federation server to federated identity service #42

Merged
merged 7 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
needs: build
steps:
- name: Add hosts for integration tests
run: sudo echo "127.0.0.1 localhost auth.example.com matrix.example.com matrix1.example.com matrix2.example.com matrix3.example.com federation.example.com opensearch.example.com" | sudo tee -a /etc/hosts
run: sudo echo "127.0.0.1 localhost auth.example.com matrix.example.com matrix1.example.com matrix2.example.com matrix3.example.com federated-identity.example.com opensearch.example.com" | sudo tee -a /etc/hosts
- uses: actions/checkout@v3
- name: Set up Node LTS
uses: actions/setup-node@v3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-tom-federation-server.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: publish-tom-federation-server
name: publish-tom-federated-identity-service

on:
workflow_call:
Expand All @@ -19,15 +19,15 @@ jobs:
uses: tj-actions/changed-files@v41
with:
files: |
packages/federation-server/**/*
packages/federated-identity-service/**/*
.github/workflows/**
- name: Publish to dockerhub
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: linagora/tom-federation-server
name: linagora/tom-federated-identity-service
username: ${{ secrets.DOCKERHUB_USER }}
password: ${{ secrets.DOCKERHUB_PASSWORD }}
workdir: "${{ github.workspace }}"
context: .
buildoptions: "-t linagora/tom-federation-server -f packages/federation-server/Dockerfile"
buildoptions: "-t linagora/tom-federated-identity-service -f packages/federated-identity-service/Dockerfile"
tags: "latest,${{ steps.date.outputs.date }}"
2 changes: 1 addition & 1 deletion .github/workflows/publish-tom-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: tj-actions/changed-files@v41
with:
files: |
packages/federation-server/**/*
packages/federated-identity-service/**/*
.github/workflows/**
- name: Publish to dockerhub
uses: elgohr/Publish-Docker-Github-Action@v5
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
name: Build And Test
uses: ./.github/workflows/build-and-test.yml
secrets: inherit
publish-federation-server:
name: Publish Federation Server
uses: ./.github/workflows/publish-tom-federation-server.yml
publish-federated-identity-service:
name: Publish Federated Identity Service
uses: ./.github/workflows/publish-tom-federated-identity-service.yml
needs: [test]
secrets: inherit
publish-tom-server:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ test:
- npm
script:
- cp /etc/hosts ~/hosts.new
- sed -i "s#\tdocker#\tdocker auth.example.com matrix.example.com matrix1.example.com matrix2.example.com matrix3.example.com federation.example.com#g" ~/hosts.new
- sed -i "s#\tdocker#\tdocker auth.example.com matrix.example.com matrix1.example.com matrix2.example.com matrix3.example.com federated-identity.example.com#g" ~/hosts.new
- cp -f ~/hosts.new /etc/hosts
- apt-get update && apt-get --assume-yes install ca-certificates curl gnupg coreutils
- install -m 0755 -d /etc/apt/keyrings
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env BASE_URL= \
DATABASE_USER= \
DATABASE_PASSWORD= \
DATABASE_SSL= \
FEDERATION_SERVERS= \
FEDERATED_IDENTITY_SERVICES= \
JITSI_BASE_URL= \
JITSI_JWT_ALGORITHM= \
JITSI_JWT_ISSUER= \
Expand Down Expand Up @@ -45,7 +45,7 @@ env BASE_URL= \
OPENSEARCH_WAIT_FOR_ACTIVE_SHARDS= \
SERVER_NAME= \
TEMPLATE_DIR=/usr/src/app/packages/tom-server/templates \
UDPATE_FEDERATION_HASHES_CRON="3 3 * * *" \
UPDATE_FEDERATED_IDENTITY_HASHES_CRON="3 3 * * *" \
UPDATE_USERS_CRON="*/15 * * * *" \
SMS_API_LOGIN= \
SMS_API_URL= \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ REST API Endpoints documentation is available on https://linagora.github.io/ToM-
[Matrix Identity Service](https://spec.matrix.org/v1.6/identity-service-api/) implementation for Node.js
* [@twake/matrix-invite](./packages/matrix-invite): matrix invitation web application
* [@twake/server](./packages/tom-server): the main Twake Chat Server, extends [@twake/matrix-identity-server](./packages/matrix-identity-server)
* [@twakeg/federation-server](./packages/federation-server): Twake Federation Server
* [@twake/federated-identity-service](./packages/federated-identity-service): Twake Federated Identity Service
* [@twake/config-parser](./packages/config-parser): simple file parser that uses also environment variables
* [@twake/crypto](./packages/crypto): cryptographic methods for Twake Chat
* [@twake/logger](./packages/logger): logger for Twake
Expand Down
2 changes: 1 addition & 1 deletion docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Image are published in docker hub:
* [The ToM Server itself](https://hub.docker.com/r/linagora/tom-server)
* [The Federation Identity Server](https://hub.docker.com/r/linagora/tom-federation-server)
* [The Federated Identity Service](https://hub.docker.com/r/linagora/tom-federated-identity-service)

## The ToM server image

Expand Down
2 changes: 1 addition & 1 deletion docs/openapi.json

Large diffs are not rendered by default.

Loading
Loading