Check in log config, resolve YAML issues

.gitignore

@@ -1,3 +1,3 @@
-*.pem
-ocf-kubernetes-deploy-secret-*.erb
+# Kubernetes deployment secrets
+kubernetes/ocf-kubernetes-deploy-secret-*.erb
 secret.yaml

kubernetes/bridge.yml.erb

@@ -13,7 +13,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: matrix-bridge-deployment
+  name: matrix-bridge
   labels:
     app: matrix-bridge
 spec:

kubernetes/secrets/synapse-config/homeserver.yaml.erb

@@ -25,21 +25,15 @@ listeners:
 admin_contact: 'mailto:[email protected]'
 
 acme:
-    enabled: false
-    port: 80
-    bind_addresses: ['::', '0.0.0.0']
-    reprovision_threshold: 30
-    # FIXME: is this acme section necessary?
-    domain: matrix.example.com
-    account_key_file: /etc/matrix-shared/acme_account.key
+  enabled: false
 
 # TODO: Change to Postgres
 database:
   name: "sqlite3"
   args:
     database: "/data/homeserver.db"
 
-log_config: "/data/matrix.ocf.berkeley.edu.log.config"
+log_config: "/etc/matrix-synapse/synapse.log.config"
 
 media_store_path: "/data/media_store"
 enable_registration: false
@@ -49,15 +43,13 @@ enable_metrics: true
 report_stats: false
 
 app_service_config_files:
-   - /etc/matrix-bridge/appservice-registration-irc.yaml
+  - /etc/matrix-bridge/appservice-registration-irc.yaml
 
 macaroon_secret_key: "<%= macaroon_secret_key %>"
 
 form_secret: "<%= form_secret %>"
 
 signing_key_path: "/etc/matrix-shared/matrix.ocf.berkeley.edu.signing.key"
-old_signing_keys:
-    # TODO: populate this section with the old key
 
 trusted_key_servers:
   - server_name: "matrix.org"
@@ -72,9 +64,9 @@ password_config:
   enabled: false
 
 stats:
-   enabled: true
-   bucket_size: 1d
-   retention: 1y
+  enabled: true
+  bucket_size: 1d
+  retention: 1y
 
 alias_creation_rules:
   - user_id: "*"

kubernetes/secrets/synapse-config/synapse.log.config.erb

@@ -0,0 +1,28 @@
+version: 1
+
+formatters:
+  precise:
+   format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+
+filters:
+  context:
+    (): synapse.logging.context.LoggingContextFilter
+    request: ""
+
+handlers:
+  console:
+    class: logging.StreamHandler
+    formatter: precise
+    filters: [context]
+
+loggers:
+    synapse.storage.SQL:
+        # beware: increasing this to DEBUG will make synapse log sensitive
+        # information such as access tokens.
+        level: INFO
+
+root:
+    level: INFO
+    handlers: [console]
+
+disable_existing_loggers: false

kubernetes/synapse.yml.erb

@@ -13,7 +13,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: matrix-deployment
+  name: matrix-synapse
   labels:
     app: matrix
 spec:
@@ -28,7 +28,6 @@ spec:
     spec:
       containers:
         - name: matrix-synapse
-          # TODO: replace with versions
           image: "docker.ocf.berkeley.edu/synapse:<%= version %>"
           ports:
             - containerPort: 8008