Rename several

- mailserver.human-connection  —>  mail.ocelot.social
- letsencrypt-staging  —>  letsencrypt-develop
- letsencrypt-prod  —>  letsencrypt-production
- Renamed files.

deployment/digital-ocean/https/README.md

@@ -53,7 +53,7 @@ $ kubectl describe --namespace=human-connection certificate tls
 $ kubectl describe --namespace=human-connection secret tls
 ```
 
-If everything looks good, update the issuer of your ingress. Change the annotation `certmanager.k8s.io/issuer` from `letsencrypt-staging` to `letsencrypt-prod` in your ingress configuration in `ingress.yaml`.
+If everything looks good, update the issuer of your ingress. Change the annotation `certmanager.k8s.io/issuer` from `letsencrypt-develop` to `letsencrypt-production` in your ingress configuration in `ingress.yaml`.
 
 ```bash
 # in folder deployment/digital-ocean/https/

deployment/digital-ocean/https/templates/ingress.template.yaml

@@ -5,24 +5,23 @@ metadata:
   namespace: ocelot-social
   annotations:
     kubernetes.io/ingress.class: "nginx"
-    certmanager.k8s.io/issuer: "letsencrypt-staging"
+    certmanager.k8s.io/issuer: "letsencrypt-develop"
     certmanager.k8s.io/acme-challenge-type: http01
     nginx.ingress.kubernetes.io/proxy-body-size: 6m
 spec:
   tls:
     - hosts:
-        # - nitro-mailserver.human-connection.org
-        - develop.human-connection.org
+        - develop-k8s.ocelot.social
       secretName: tls
   rules:
-    - host: develop.human-connection.org
+    - host: develop-k8s.ocelot.social
       http:
         paths:
           - path: /
             backend:
               serviceName: web
               servicePort: 3000
-  - host: mailserver.human-connection.org
+  - host: mail.ocelot.social
     http:
       paths:
       - path: /

deployment/digital-ocean/https/templates/issuer.template.yaml

@@ -2,7 +2,7 @@
   apiVersion: certmanager.k8s.io/v1alpha1
   kind: Issuer
   metadata:
-    name: letsencrypt-staging
+    name: letsencrypt-develop
     namespace: ocelot-social
   spec:
     acme:
@@ -12,14 +12,14 @@
       email: user@example.com
       # Name of a secret used to store the ACME account private key
       privateKeySecretRef:
-        name: letsencrypt-staging
+        name: letsencrypt-develop
       # Enable the HTTP-01 challenge provider
       http01: {}
 ---
    apiVersion: certmanager.k8s.io/v1alpha1
    kind: Issuer
    metadata:
-     name: letsencrypt-prod
+     name: letsencrypt-production
      namespace: ocelot-social
    spec:
      acme:
@@ -29,6 +29,6 @@
        email: user@example.com
        # Name of a secret used to store the ACME account private key
        privateKeySecretRef:
-         name: letsencrypt-prod
+         name: letsencrypt-production
        # Enable the HTTP-01 challenge provider
        http01: {}

deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-develop.yaml

@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-staging
+  name: letsencrypt-develop
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
     server: https://acme-staging-v02.api.letsencrypt.org/directory
     email: {{ .Values.supportEmail }}
     privateKeySecretRef:
-      name: letsencrypt-staging
+      name: letsencrypt-develop
     solvers:
     - http01:
         ingress:

deployment/helm/ocelot.social/templates/cluster-issuers/letsencrypt-production.yaml

@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:
-  name: letsencrypt-prod
+  name: letsencrypt-production
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -13,7 +13,7 @@ spec:
     server: https://acme-v02.api.letsencrypt.org/directory
     email: {{ .Values.supportEmail }}
     privateKeySecretRef:
-      name: letsencrypt-prod
+      name: letsencrypt-production
     solvers:
     - http01:
         ingress:

deployment/helm/ocelot.social/values.yaml

@@ -19,7 +19,7 @@ image:
   # pullPolicy indicates when, if ever, pods pull a new image from docker hub.
   pullPolicy: IfNotPresent
 # letsencryptIssuer is used by cert-manager to set up certificates with the given provider.
-letsencryptIssuer: "letsencrypt-prod"
+letsencryptIssuer: "letsencrypt-production"
 # neo4jConfig changes any default neo4j config/adds it.
 neo4jConfig:
   # acceptLicenseAgreement is used to agree to the license agreement for neo4j's enterprise edition.

deployment/ocelot-social/templates/configmap.template.yaml

@@ -2,7 +2,7 @@
   apiVersion: v1
   kind: ConfigMap
   data:
-    SMTP_HOST: "mailserver.human-connection"
+    SMTP_HOST: "mail.ocelot.social"
     SMTP_PORT: "25"
     GRAPHQL_URI: "http://backend.human-connection:4000"
     NEO4J_URI: "bolt://neo4j.human-connection:7687"

deployment/ocelot-social/templates/secrets.template.yaml

@@ -2,13 +2,12 @@ apiVersion: v1
 kind: Secret
 data:
   JWT_SECRET: "Yi8mJjdiNzhCRiZmdi9WZA=="
-  MONGODB_PASSWORD: "TU9OR09EQl9QQVNTV09SRA=="
   PRIVATE_KEY_PASSPHRASE: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
-  MAPBOX_TOKEN: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1EK"
-  SMTP_USERNAME:
-  SMTP_PASSWORD:
+  MAPBOX_TOKEN: "pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
   NEO4J_USERNAME:
   NEO4J_PASSWORD:
+  SMTP_USERNAME:
+  SMTP_PASSWORD:
 metadata:
   name: ocelot-social
-  namespace: human-connection
+  namespace: ocelot-social