Add changes

Author: thejsj

.gitignore

@@ -13,6 +13,8 @@ enviroments/**/k8/**/configMaps/*cert*
 environments/*/secrets/**/*
 # Leaving for now while PR is merged
 environments/*/k8
+# Meant to not break anything. Might remove later
+environments/self-hosted-test
 *.retry
 *.tfstate*
 terraform/credentials.tfvars

ansible/group_vars/all.yml

@@ -1,4 +1,8 @@
 ---
+# Defaults
+github_domain: api.github.com
+github_protocol: https
+
 # ops
 ops_slack_channel_url: https://hooks.slack.com/services/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
 pager_duty_key: testkey
@@ -61,6 +65,7 @@ core_file_dir: /docker/app-cores
 # agreeable-egret
 agreeable_egret_hostname: egret.{{ domain }}
 egret_pg_database: egret
+egret_port: 65520
 
 #angular
 angular_url: https://app.{{ domain }}
@@ -96,6 +101,7 @@ charon_port: 53
 # clio
 clio_host_address: clio
 clio_port: 8008
+clio_mongo_database: clio
 
 # consul
 consul_api_port: 8500
@@ -121,6 +127,7 @@ log_facility: local7
 
 # docker
 docker_port: 4242
+docker_config: docks
 
 # docker-listener
 docker_listener_rollbar_key: 7b5924eccfff415d9fc00c051811e9d7

ansible/group_vars/alpha-mongo.yml

@@ -4,6 +4,8 @@ container_run_args: ''
 
 storage_size_gb: 50
 
+volume_id: "{{ mongo_volume_id }}"
+
 volume_mounts:
   - name: "{{ name }}-db-claim"
     path: /data/db

ansible/group_vars/alpha-rabbitmq.yml

@@ -5,6 +5,8 @@ hosted_ports: [ "{{ rabbit_port }}", 15672 ]
 
 storage_size_gb: 50
 
+volume_id: "{{ rabbit_volume_id }}"
+
 volume_mounts:
   - name: "{{ name }}-db-claim"
     path: /var/lib/rabbitmq

ansible/group_vars/alpha-redis.yml

@@ -3,6 +3,8 @@ hosted_ports: ["{{ redis_port }}"]
 
 storage_size_gb: 50
 
+volume_id: "{{ redis_volume_id }}"
+
 volume_mounts:
   - name: "{{ name }}-db-claim"
     path: /data

ansible/roles/content-domain-proxy/tasks/main.yml

@@ -1,4 +1,15 @@
 ---
+- name: create chained cert
+  tags: [ certs ]
+  shell: |
+    cat {{ domains_root }}/{{ user_content_domain }}/cert.pem  > {{ domains_root }}/{{ user_content_domain }}/chained.pem
+    echo "" >> {{ domains_root }}/{{ user_content_domain }}/chained.pem # Add newline
+    cat {{ domains_root }}/{{ user_content_domain }}/ca.pem  > {{ domains_root }}/{{ user_content_domain }}/chained.pem
+
+- name: create dhparam.pem
+  tags: [ certs ]
+  command: openssl dhparam -out {{ domains_root }}/{{ user_content_domain }}/dhparam.pem 2048
+
 - set_fact:
     ca_data: "{{ lookup('file', '{{ domains_root }}/{{ user_content_domain }}/ca.pem') }}"
 - set_fact: