diff --git a/docker-compose.yml b/docker-compose.yml index 7cc2cc4..6af45ad 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ zulip: REDIS_HOST: "redis" RABBITMQ_HOST: "rabbitmq" ZULIP_USER_EMAIL: "example@example.com" - ZULIP_USER_DOMAIN: "zerbytes.net" + ZULIP_USER_DOMAIN: "example.com" ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend: "EmailAuthBackend" ZULIP_SECRETS_email_password: "12345" ZULIP_SECRETS_rabbitmq_password: "zulip" diff --git a/kubernetes/zulip-rc.yml b/kubernetes/zulip-rc.yml index 0425fde..85fc13a 100644 --- a/kubernetes/zulip-rc.yml +++ b/kubernetes/zulip-rc.yml @@ -32,11 +32,28 @@ spec: limits: cpu: 75m memory: 768Mi + - name: rabbitmq + image: docker.io/rabbitmq:3.5.5 + resources: + limits: + cpu: 75m + memory: 768Mi + env: + - name: RABBITMQ_DEFAULT_USER + value: "zulip" + - name: RABBITMQ_DEFAULT_PASS + value: "zulip" + - name: camo + image: quay.io/galexrt/camo:latest + resources: + limits: + cpu: 75m + memory: 512Mi - name: postgresql image: quay.io/galexrt/zulip-postgresql-tsearchextras:latest resources: limits: - cpu: 50m + cpu: 80m memory: 768Mi env: - name: DB_NAME @@ -52,8 +69,8 @@ spec: image: quay.io/galexrt/zulip:3.1.6 resources: limits: - cpu: 95m - memory: 1536Mi + cpu: 100m + memory: 3584Mi env: - name: DB_HOST value: "database" @@ -66,7 +83,7 @@ spec: - name: ZULIP_USER_EMAIL value: "example@example.com" - name: ZULIP_USER_DOMAIN - value: "zerbytes.net" + value: "example.com" - name: ZULIP_AUTHENTICATION_BACKENDS_EmailAuthBackend value: "EmailAuthBackend" - name: ZULIP_SECRETS_email_password