Commit 5582c78b authored by nimrod's avatar nimrod
Browse files

Merge branch 'matrix'

parents 3bbd6c9a 0c9178f2

.gitlab-ci.yml

+26 −0
Original line number Diff line number Diff line
@@ -101,3 +101,29 @@ web-proxy host01 run: 
    WORKDIR: Compose/web-proxy/host01

  when: manual

  rules: *compose-rules



# Matrix Compose deployment.



matrix-build:

  extends: .compose-build

  tags: &matrix-tags [host01.shore.co.il]

  variables: &matrix-vars

    WORKDIR: Compose/matrix



matrix-pull:

  extends: .compose-pull

  tags: *matrix-tags

  variables: *matrix-vars



matrix-run:

  extends: .compose-run

  tags: *matrix-tags

  variables: *matrix-vars

  needs:

    - job: matrix-build

    - job: matrix-pull

  after_script:

    # yamllint disable rule:line-length

    - docker-compose exec synapse sh -c "while [ ! -f /conf/homeserver.yaml ]; do echo Waiting for the config file.; sleep 1; done"

    - docker-compose exec synapse update_synapse_database --run-background-updates --database-config /conf/homeserver.yaml

    # yamllint enable rule:line-length

.pre-commit-config.yaml

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ repos: 
      - id: check-toml

      - id: check-xml

      - id: check-yaml

        exclude: ^Ansible/roles/(wap|router)/vars/main\.yaml$

        # yamllint disable-line rule:line-length

        exclude: ^Ansible/roles/(wap|router)/vars/main\.yaml$|^Compose/matrix/synapse/homeserver\.yaml$

      - id: detect-private-key

      - id: end-of-file-fixer

      - id: trailing-whitespace
@@ -50,6 +51,7 @@ repos: 
    rev: v1.26.3

    hooks:

      - id: yamllint

        exclude: ^Compose/matrix/synapse/homeserver\.yaml$$



  - repo: https://github.com/executablebooks/mdformat.git

    rev: 0.7.10

Ansible/renew-certs.yaml

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
          - nextcloud.shore.co.il

          - ns1.shore.co.il

          - notify.shore.co.il

          - matrix.shore.co.il

          - sogo.shore.co.il

          - vouch.shore.co.il

          - zpush.shore.co.il

Ansible/roles/router/files/nsd/shore.co.il

+7 −5
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
$TTL 1h

$ORIGIN shore.co.il.

@               IN      SOA     ns1     hostmaster (

        2023040801

        4h

        1h

        4w

        3h )

        2023121501 ; Serial

        4h         ; Refresh

        1h         ; Retry

        4w         ; Expire

        3h         ; Negative response cache TTL

)



        IN      NS      ns1

        IN      NS      ns4
@@ -63,6 +64,7 @@ kibana IN CNAME ns4 
kodi            IN  CNAME   ns1

lam             IN  CNAME   ns1

library         IN  CNAME   ns1

matrix          IN  CNAME   ns1

mta-sts         IN  CNAME   smtp

myip            IN  CNAME   ns4

nextcloud       IN  CNAME   ns1

Compose/matrix/.env

0 → 100644
+1 −0
Original line number Diff line number Diff line 
COMPOSE_PROJECT_NAME=matrix