Commit 96bed76c authored by nimrod's avatar nimrod
Browse files

Some cleanup. 

- Update the Terraform documentation.
- Update Vouch.
- Cleanup the GitLab CI file.
parent ba92a6a1

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ web-proxy host01 build: 
  tags: ["host01.shore.co.il"]

  variables:

    WORKDIR: Compose/web-proxy/host01

  # rules: *compose-rules

  rules: *compose-rules



web-proxy host01 pull:

  extends: .compose-pull

  tags: ["host01.shore.co.il"]

  variables:

    WORKDIR: Compose/web-proxy/host01

  # rules: *compose-rules

  rules: *compose-rules



web-proxy host01 run:

  extends: .compose-run
@@ -100,4 +100,4 @@ web-proxy host01 run: 
  variables:

    WORKDIR: Compose/web-proxy/host01

  when: manual

  # rules: *compose-rules
 
  rules: *compose-rules

Compose/web-proxy/host01/docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ services: 
      VOUCH_DOMAINS: shore.co.il

      VOUCH_JWT_MAXAGE: 10080  # 1 week.

      VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}"  # pragma: allowlist secret

    image: quay.io/vouch/vouch-proxy:alpine-0.36.0

    image: quay.io/vouch/vouch-proxy:alpine-0.39.0

    restart: always



networks:

Compose/web-proxy/kodi/docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ services: 
      VOUCH_DOMAINS: shore.co.il

      VOUCH_JWT_MAXAGE: 10080  # 1 week.

      VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}"  # pragma: allowlist secret

    image: quay.io/vouch/vouch-proxy:alpine-0.36.0

    image: quay.io/vouch/vouch-proxy:alpine-0.39.0

    restart: always



networks:

Compose/web-proxy/ns4/docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ services: 
      VOUCH_DOMAINS: shore.co.il

      VOUCH_JWT_MAXAGE: 10080  # 1 week.

      VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}"  # pragma: allowlist secret

    image: quay.io/vouch/vouch-proxy:alpine-0.36.0

    image: quay.io/vouch/vouch-proxy:alpine-0.39.0

    restart: always



networks:

Terraform/README.md

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


Services managed with Terraform.



# Terraform state

## Terraform state



Project usually store their state in GitLab using [GitLab managed Terraform

State](https://docs.gitlab.com/ee/user/infrastructure/iac/terraform_state.html).