From e496aac1dcdc8a3075e174206c973163a6e9384d Mon Sep 17 00:00:00 2001 From: Adria Cidre Date: Wed, 16 Nov 2016 11:44:02 +0100 Subject: [PATCH 01/14] [#ERNEST-107] : Deploy rds-all-aws-connector --- definition.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/definition.yml b/definition.yml index 69eaf0c..65cb30a 100644 --- a/definition.yml +++ b/definition.yml @@ -488,3 +488,13 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + + - name: rds-all-aws-connector + path: git@github.com:ernestio/rds-all-aws-connector.git + branch: master + links: + - nats + depends: + - config-store + environment: + NATS_URI: 'nats://nats:4222' From 0754f52a4df383e671be961b6db0e909c7510c71 Mon Sep 17 00:00:00 2001 From: Adria Cidre Date: Tue, 15 Nov 2016 12:51:08 +0100 Subject: [PATCH 02/14] [#ERNEST-139] : Use nat-all-aws-connector instead of one per subject --- definition.yml | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/definition.yml b/definition.yml index 69eaf0c..dce7eee 100644 --- a/definition.yml +++ b/definition.yml @@ -327,8 +327,8 @@ repos: environment: NATS_URI: 'nats://nats:4222' - - name: nat-creator-aws-connector - path: git@github.com:ernestio/nat-creator-aws-connector.git + - name: nat-all-aws-connector + path: git@github.com:ernestio/all-all-aws-connector.git branch: master links: - nats @@ -336,39 +336,10 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + COMPONENTS: 'nat.create.aws,nat.update.aws,nat.delete.aws' - - name: nat-deleter-aws-connector - path: git@github.com:ernestio/nat-deleter-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: nat-updater-aws-connector - path: git@github.com:ernestio/nat-updater-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: network-creator-aws-connector - path: git@github.com:ernestio/network-creator-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: network-deleter-aws-connector - path: git@github.com:ernestio/network-deleter-aws-connector.git + - name: network-all-aws-connector + path: git@github.com:ernestio/all-all-aws-connector.git branch: master links: - nats @@ -376,6 +347,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + COMPONENTS: 'network.create.aws,network.delete.aws' - name: execution-run-salt-connector path: git@github.com:ernestio/execution-run-salt-connector.git From fc9d0f680ee9888300e1926feb386b2a08b13c07 Mon Sep 17 00:00:00 2001 From: Adria Cidre Date: Tue, 22 Nov 2016 14:33:54 +0100 Subject: [PATCH 03/14] Fix all-all-aws-deploys --- definition.yml | 154 +------------------------------------------------ 1 file changed, 2 insertions(+), 152 deletions(-) diff --git a/definition.yml b/definition.yml index 31fd6de..6ab2122 100644 --- a/definition.yml +++ b/definition.yml @@ -267,67 +267,7 @@ repos: environment: NATS_URI: 'nats://nats:4222' - - name: firewall-creator-aws-connector - path: git@github.com:ernestio/firewall-creator-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: firewall-deleter-aws-connector - path: git@github.com:ernestio/firewall-deleter-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: firewall-updater-aws-connector - path: git@github.com:ernestio/firewall-updater-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: instance-creator-aws-connector - path: git@github.com:ernestio/instance-creator-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: instance-deleter-aws-connector - path: git@github.com:ernestio/instance-deleter-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: instance-updater-aws-connector - path: git@github.com:ernestio/instance-updater-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: nat-all-aws-connector + - name: all-all-aws-connector path: git@github.com:ernestio/all-all-aws-connector.git branch: master links: @@ -336,18 +276,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' - COMPONENTS: 'nat.create.aws,nat.update.aws,nat.delete.aws' - - - name: network-all-aws-connector - path: git@github.com:ernestio/all-all-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - COMPONENTS: 'network.create.aws,network.delete.aws' + CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws - name: execution-run-salt-connector path: git@github.com:ernestio/execution-run-salt-connector.git @@ -380,66 +309,6 @@ repos: environment: NATS_URI: 'nats://nats:4222' - - name: vpc-creator-aws-connector - path: git@github.com:ernestio/vpc-creator-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: vpc-deleter-aws-connector - path: git@github.com:ernestio/vpc-deleter-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: elb-creator-aws-connector - path: git@github.com:ernestio/elb-creator-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: elb-deleter-aws-connector - path: git@github.com:ernestio/elb-deleter-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: elb-updater-aws-connector - path: git@github.com:ernestio/elb-updater-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: s3-all-aws-connector - path: git@github.com:ernestio/s3-all-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - name: logger path: git@github.com:ernestio/logger.git branch: master @@ -451,22 +320,3 @@ repos: volumes: - ./logs/:/var/logs/ - - name: route53-all-aws-connector - path: git@github.com:ernestio/route53-all-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' - - - name: rds-all-aws-connector - path: git@github.com:ernestio/rds-all-aws-connector.git - branch: master - links: - - nats - depends: - - config-store - environment: - NATS_URI: 'nats://nats:4222' From e581341f6ed2b2855387e9c38802abf2e7654884 Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Thu, 24 Nov 2016 20:07:12 +0000 Subject: [PATCH 04/14] Bump version 1.9.0 --- docker-compose.yml | 211 ++++++++------------------------------------- 1 file changed, 38 insertions(+), 173 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bd156d0..0836df5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,16 @@ version: "2" services: + all-all-aws-connector: + image: ernestio/all-all-aws-connector:1.9.0 + links: + - nats + depends_on: + - config-store + environment: + CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws + NATS_URI: nats://nats:4222 all-all-fake-connector: - image: ernestio/all-all-fake-connector:1.8.0 + image: ernestio/all-all-fake-connector:1.9.0 links: - nats - redis @@ -10,7 +19,7 @@ services: environment: NATS_URI: nats://nats:4222 api-gateway: - image: ernestio/api-gateway:1.8.0 + image: ernestio/api-gateway:1.9.0 ports: - 8080:8080 links: @@ -21,7 +30,7 @@ services: JWT_SECRET: GENERATEDJWTSECRET NATS_URI: nats://nats:4222 aws-definition-mapper: - image: ernestio/aws-definition-mapper:1.8.0 + image: ernestio/aws-definition-mapper:1.9.0 links: - nats - redis @@ -31,7 +40,7 @@ services: environment: NATS_URI: nats://nats:4222 config-store: - image: ernestio/config-store:1.8.0 + image: ernestio/config-store:1.9.0 entrypoint: /go/bin/config-store -config /etc/ernest/config.json volumes: - ./config/config-store/:/etc/ernest/ @@ -40,7 +49,7 @@ services: environment: NATS_URI: nats://nats:4222 datacenter-store: - image: ernestio/datacenter-store:1.8.0 + image: ernestio/datacenter-store:1.9.0 links: - nats depends_on: @@ -48,7 +57,7 @@ services: environment: NATS_URI: nats://nats:4222 definition-mapper: - image: ernestio/definition-mapper:1.8.0 + image: ernestio/definition-mapper:1.9.0 links: - nats - redis @@ -57,32 +66,8 @@ services: - config-store environment: NATS_URI: nats://nats:4222 - elb-creator-aws-connector: - image: ernestio/elb-creator-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - elb-deleter-aws-connector: - image: ernestio/elb-deleter-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - elb-updater-aws-connector: - image: ernestio/elb-updater-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 execution-adapter: - image: ernestio/execution-adapter:1.8.0 + image: ernestio/execution-adapter:1.9.0 links: - nats depends_on: @@ -90,7 +75,7 @@ services: environment: NATS_URI: nats://nats:4222 execution-builder: - image: ernestio/execution-builder:1.8.0 + image: ernestio/execution-builder:1.9.0 links: - nats - redis @@ -99,15 +84,7 @@ services: environment: NATS_URI: nats://nats:4222 execution-run-salt-connector: - image: ernestio/execution-run-salt-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - firewall-creator-aws-connector: - image: ernestio/firewall-creator-aws-connector:1.8.0 + image: ernestio/execution-run-salt-connector:1.9.0 links: - nats depends_on: @@ -115,23 +92,7 @@ services: environment: NATS_URI: nats://nats:4222 firewall-creator-vcloud-connector: - image: ernestio/firewall-creator-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - firewall-deleter-aws-connector: - image: ernestio/firewall-deleter-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - firewall-updater-aws-connector: - image: ernestio/firewall-updater-aws-connector:1.8.0 + image: ernestio/firewall-creator-vcloud-connector:1.9.0 links: - nats depends_on: @@ -139,7 +100,7 @@ services: environment: NATS_URI: nats://nats:4222 firewall-updater-vcloud-connector: - image: ernestio/firewall-updater-vcloud-connector:1.8.0 + image: ernestio/firewall-updater-vcloud-connector:1.9.0 links: - nats depends_on: @@ -147,7 +108,7 @@ services: environment: NATS_URI: nats://nats:4222 generic-adapter: - image: ernestio/generic-adapter:1.8.0 + image: ernestio/generic-adapter:1.9.0 links: - nats depends_on: @@ -155,7 +116,7 @@ services: environment: NATS_URI: nats://nats:4222 generic-builder: - image: ernestio/generic-builder:1.8.0 + image: ernestio/generic-builder:1.9.0 links: - nats - redis @@ -164,15 +125,7 @@ services: environment: NATS_URI: nats://nats:4222 group-store: - image: ernestio/group-store:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - instance-creator-aws-connector: - image: ernestio/instance-creator-aws-connector:1.8.0 + image: ernestio/group-store:1.9.0 links: - nats depends_on: @@ -180,15 +133,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-creator-vcloud-connector: - image: ernestio/instance-creator-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - instance-deleter-aws-connector: - image: ernestio/instance-deleter-aws-connector:1.8.0 + image: ernestio/instance-creator-vcloud-connector:1.9.0 links: - nats depends_on: @@ -196,15 +141,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-deleter-vcloud-connector: - image: ernestio/instance-deleter-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - instance-updater-aws-connector: - image: ernestio/instance-updater-aws-connector:1.8.0 + image: ernestio/instance-deleter-vcloud-connector:1.9.0 links: - nats depends_on: @@ -212,7 +149,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-updater-vcloud-connector: - image: ernestio/instance-updater-vcloud-connector:1.8.0 + image: ernestio/instance-updater-vcloud-connector:1.9.0 links: - nats depends_on: @@ -220,7 +157,7 @@ services: environment: NATS_URI: nats://nats:4222 logger: - image: ernestio/logger:1.8.0 + image: ernestio/logger:1.9.0 volumes: - ./logs/:/var/logs/ links: @@ -229,7 +166,7 @@ services: ERNEST_LOG_FILE: /var/logs/ernest.log NATS_URI: nats://nats:4222 monit: - image: ernestio/monit:1.8.0 + image: ernestio/monit:1.9.0 ports: - 22000:22000 links: @@ -239,32 +176,8 @@ services: environment: JWT_SECRET: GENERATEDJWTSECRET NATS_URI: nats://nats:4222 - nat-creator-aws-connector: - image: ernestio/nat-creator-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 nat-creator-vcloud-connector: - image: ernestio/nat-creator-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - nat-deleter-aws-connector: - image: ernestio/nat-deleter-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - nat-updater-aws-connector: - image: ernestio/nat-updater-aws-connector:1.8.0 + image: ernestio/nat-creator-vcloud-connector:1.9.0 links: - nats depends_on: @@ -272,7 +185,7 @@ services: environment: NATS_URI: nats://nats:4222 nat-updater-vcloud-connector: - image: ernestio/nat-updater-vcloud-connector:1.8.0 + image: ernestio/nat-updater-vcloud-connector:1.9.0 links: - nats depends_on: @@ -283,24 +196,8 @@ services: image: nats ports: - 4222:4222 - network-creator-aws-connector: - image: ernestio/network-creator-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 network-creator-vcloud-connector: - image: ernestio/network-creator-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - network-deleter-aws-connector: - image: ernestio/network-deleter-aws-connector:1.8.0 + image: ernestio/network-creator-vcloud-connector:1.9.0 links: - nats depends_on: @@ -308,7 +205,7 @@ services: environment: NATS_URI: nats://nats:4222 network-deleter-vcloud-connector: - image: ernestio/network-deleter-vcloud-connector:1.8.0 + image: ernestio/network-deleter-vcloud-connector:1.9.0 links: - nats depends_on: @@ -334,16 +231,8 @@ services: DB_NAME: users,groups,datacenters,services redis: image: redis - route53-all-aws-connector: - image: ernestio/route53-all-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 router-creator-vcloud-connector: - image: ernestio/router-creator-vcloud-connector:1.8.0 + image: ernestio/router-creator-vcloud-connector:1.9.0 links: - nats depends_on: @@ -351,15 +240,7 @@ services: environment: NATS_URI: nats://nats:4222 router-deleter-vcloud-connector: - image: ernestio/router-deleter-vcloud-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - s3-all-aws-connector: - image: ernestio/s3-all-aws-connector:1.8.0 + image: ernestio/router-deleter-vcloud-connector:1.9.0 links: - nats depends_on: @@ -367,7 +248,7 @@ services: environment: NATS_URI: nats://nats:4222 service-store: - image: ernestio/service-store:1.8.0 + image: ernestio/service-store:1.9.0 links: - nats depends_on: @@ -375,7 +256,7 @@ services: environment: NATS_URI: nats://nats:4222 user-store: - image: ernestio/user-store:1.8.0 + image: ernestio/user-store:1.9.0 links: - nats depends_on: @@ -383,7 +264,7 @@ services: environment: NATS_URI: nats://nats:4222 vcloud-definition-mapper: - image: ernestio/vcloud-definition-mapper:1.8.0 + image: ernestio/vcloud-definition-mapper:1.9.0 links: - nats - redis @@ -392,24 +273,8 @@ services: - config-store environment: NATS_URI: nats://nats:4222 - vpc-creator-aws-connector: - image: ernestio/vpc-creator-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 - vpc-deleter-aws-connector: - image: ernestio/vpc-deleter-aws-connector:1.8.0 - links: - - nats - depends_on: - - config-store - environment: - NATS_URI: nats://nats:4222 workflow-manager: - image: ernestio/workflow-manager:1.8.0 + image: ernestio/workflow-manager:1.9.0 links: - nats - redis From d04cea11c74744ce7aac5035d07256f276a361aa Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Fri, 25 Nov 2016 16:34:27 +0000 Subject: [PATCH 05/14] adding additional connectors for rds --- definition.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definition.yml b/definition.yml index 6ab2122..8e45a24 100644 --- a/definition.yml +++ b/definition.yml @@ -276,7 +276,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' - CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws + CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws,rds_cluster.create.aws,rds_cluster.update.aws,rds_cluster.delete.aws,rds_instance.create.aws,rds_instance.update.aws,rds_instance.delete.aws - name: execution-run-salt-connector path: git@github.com:ernestio/execution-run-salt-connector.git From 3822f71548c555445d601fd80fcc05207d6fa9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Thu, 1 Dec 2016 12:38:45 +0100 Subject: [PATCH 06/14] [#ERNEST-173] : Logger to persist adapters --- definition.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/definition.yml b/definition.yml index 8e45a24..ed4ff22 100644 --- a/definition.yml +++ b/definition.yml @@ -317,6 +317,8 @@ repos: environment: NATS_URI: 'nats://nats:4222' ERNEST_LOG_FILE: '/var/logs/ernest.log' + ERNEST_LOG_CONFIG: '/etc/ernest/' volumes: - ./logs/:/var/logs/ + - ./config/:/etc/ernest/ From f0c0185ee6d9b23b7d119645949e719640b61efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Thu, 1 Dec 2016 13:40:31 +0100 Subject: [PATCH 07/14] [#ERNEST-155] : Allow user to introduce default admin credentials --- setup | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/setup b/setup index 56ff611..0c35faa 100755 --- a/setup +++ b/setup @@ -55,9 +55,16 @@ docker-compose up -d wget https://s3-eu-west-1.amazonaws.com/ernest-tools/natsc-`uname` -O natsc chmod +x ./natsc +echo "Please provide your desired admin credentials:" +read -p "- Username: " USERNAME +read -p "- Password: " PASSWORD + + # setup admin accounts ./natsc request -s nats://127.0.0.1:4222 -t 5 -r 99 'group.set' '{"id":"1","name": "admin"}' -./natsc request -s nats://127.0.0.1:4222 -t 5 -r 99 'user.set' '{"group_id": 1, "username": "admin", "password": "w4rmR3d", "admin":true}' +./natsc request -s nats://127.0.0.1:4222 -t 5 -r 99 'user.set' "{\"group_id\": 1, \"username\": \"$USERNAME\", \"password\": \"$PASSWORD\", \"admin\":true}" echo -echo "Setup complete. Please target Ernest CLI using https://127.0.0.1:443, or https://$ERNESTHOST" +echo "Setup complete!" +echo "Please download the last version of ernest-cli from https://github.com/ernestio/ernest-cli/releases" +echo "and run 'ernest-cli setup' providing https://$ERNESTHOST as target" From b21fdfe1e85bc3013d0cb70a1ffc9be4bf521ef5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Fri, 2 Dec 2016 09:26:20 +0100 Subject: [PATCH 08/14] Hide password on the input --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 0c35faa..be29de3 100755 --- a/setup +++ b/setup @@ -57,7 +57,7 @@ chmod +x ./natsc echo "Please provide your desired admin credentials:" read -p "- Username: " USERNAME -read -p "- Password: " PASSWORD +read -s -p "- Password: " PASSWORD # setup admin accounts From e0e7c527ae8d2abd84f8275944c194c4957653c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Fri, 2 Dec 2016 15:48:23 +0100 Subject: [PATCH 09/14] Cross platform sed on setup script --- setup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup b/setup index be29de3..8a91d70 100755 --- a/setup +++ b/setup @@ -36,11 +36,11 @@ openssl req \ -keyout ./config/nginx/ernest.key \ -out ./config/nginx/ernest.crt -sed -i "s/ERNESTHOST/$ERNESTHOST/g" ./config/nginx/ernest.local +sed -i.bak "s/ERNESTHOST/$ERNESTHOST/g" ./config/nginx/ernest.local && rm ./config/nginx/ernest.local.bak # Setup a random JWT Token for api-gateway TOKEN=`openssl rand -base64 32` -sed -i "s:GENERATEDJWTSECRET:$TOKEN:g" docker-compose.yml +sed -i.bak "s:GENERATEDJWTSECRET:$TOKEN:g" docker-compose.yml && rm docker-compose.yml.bak # Make volume for postgres data mkdir -p postgres/data From dd4188587053cf3c8b804ff2f47bec912c2d633e Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Mon, 5 Dec 2016 13:13:21 +0000 Subject: [PATCH 10/14] Bump version 1.10.0 --- docker-compose.yml | 64 ++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0836df5..7346fb2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,16 @@ version: "2" services: all-all-aws-connector: - image: ernestio/all-all-aws-connector:1.9.0 + image: ernestio/all-all-aws-connector:1.10.0 links: - nats depends_on: - config-store environment: - CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws + CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws,rds_cluster.create.aws,rds_cluster.update.aws,rds_cluster.delete.aws,rds_instance.create.aws,rds_instance.update.aws,rds_instance.delete.aws NATS_URI: nats://nats:4222 all-all-fake-connector: - image: ernestio/all-all-fake-connector:1.9.0 + image: ernestio/all-all-fake-connector:1.10.0 links: - nats - redis @@ -19,7 +19,7 @@ services: environment: NATS_URI: nats://nats:4222 api-gateway: - image: ernestio/api-gateway:1.9.0 + image: ernestio/api-gateway:1.10.0 ports: - 8080:8080 links: @@ -30,7 +30,7 @@ services: JWT_SECRET: GENERATEDJWTSECRET NATS_URI: nats://nats:4222 aws-definition-mapper: - image: ernestio/aws-definition-mapper:1.9.0 + image: ernestio/aws-definition-mapper:1.10.0 links: - nats - redis @@ -40,7 +40,7 @@ services: environment: NATS_URI: nats://nats:4222 config-store: - image: ernestio/config-store:1.9.0 + image: ernestio/config-store:1.10.0 entrypoint: /go/bin/config-store -config /etc/ernest/config.json volumes: - ./config/config-store/:/etc/ernest/ @@ -49,7 +49,7 @@ services: environment: NATS_URI: nats://nats:4222 datacenter-store: - image: ernestio/datacenter-store:1.9.0 + image: ernestio/datacenter-store:1.10.0 links: - nats depends_on: @@ -57,7 +57,7 @@ services: environment: NATS_URI: nats://nats:4222 definition-mapper: - image: ernestio/definition-mapper:1.9.0 + image: ernestio/definition-mapper:1.10.0 links: - nats - redis @@ -67,7 +67,7 @@ services: environment: NATS_URI: nats://nats:4222 execution-adapter: - image: ernestio/execution-adapter:1.9.0 + image: ernestio/execution-adapter:1.10.0 links: - nats depends_on: @@ -75,7 +75,7 @@ services: environment: NATS_URI: nats://nats:4222 execution-builder: - image: ernestio/execution-builder:1.9.0 + image: ernestio/execution-builder:1.10.0 links: - nats - redis @@ -84,7 +84,7 @@ services: environment: NATS_URI: nats://nats:4222 execution-run-salt-connector: - image: ernestio/execution-run-salt-connector:1.9.0 + image: ernestio/execution-run-salt-connector:1.10.0 links: - nats depends_on: @@ -92,7 +92,7 @@ services: environment: NATS_URI: nats://nats:4222 firewall-creator-vcloud-connector: - image: ernestio/firewall-creator-vcloud-connector:1.9.0 + image: ernestio/firewall-creator-vcloud-connector:1.10.0 links: - nats depends_on: @@ -100,7 +100,7 @@ services: environment: NATS_URI: nats://nats:4222 firewall-updater-vcloud-connector: - image: ernestio/firewall-updater-vcloud-connector:1.9.0 + image: ernestio/firewall-updater-vcloud-connector:1.10.0 links: - nats depends_on: @@ -108,7 +108,7 @@ services: environment: NATS_URI: nats://nats:4222 generic-adapter: - image: ernestio/generic-adapter:1.9.0 + image: ernestio/generic-adapter:1.10.0 links: - nats depends_on: @@ -116,7 +116,7 @@ services: environment: NATS_URI: nats://nats:4222 generic-builder: - image: ernestio/generic-builder:1.9.0 + image: ernestio/generic-builder:1.10.0 links: - nats - redis @@ -125,7 +125,7 @@ services: environment: NATS_URI: nats://nats:4222 group-store: - image: ernestio/group-store:1.9.0 + image: ernestio/group-store:1.10.0 links: - nats depends_on: @@ -133,7 +133,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-creator-vcloud-connector: - image: ernestio/instance-creator-vcloud-connector:1.9.0 + image: ernestio/instance-creator-vcloud-connector:1.10.0 links: - nats depends_on: @@ -141,7 +141,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-deleter-vcloud-connector: - image: ernestio/instance-deleter-vcloud-connector:1.9.0 + image: ernestio/instance-deleter-vcloud-connector:1.10.0 links: - nats depends_on: @@ -149,7 +149,7 @@ services: environment: NATS_URI: nats://nats:4222 instance-updater-vcloud-connector: - image: ernestio/instance-updater-vcloud-connector:1.9.0 + image: ernestio/instance-updater-vcloud-connector:1.10.0 links: - nats depends_on: @@ -157,16 +157,18 @@ services: environment: NATS_URI: nats://nats:4222 logger: - image: ernestio/logger:1.9.0 + image: ernestio/logger:1.10.0 volumes: - ./logs/:/var/logs/ + - ./config/:/etc/ernest/ links: - nats environment: + ERNEST_LOG_CONFIG: /etc/ernest/ ERNEST_LOG_FILE: /var/logs/ernest.log NATS_URI: nats://nats:4222 monit: - image: ernestio/monit:1.9.0 + image: ernestio/monit:1.10.0 ports: - 22000:22000 links: @@ -177,7 +179,7 @@ services: JWT_SECRET: GENERATEDJWTSECRET NATS_URI: nats://nats:4222 nat-creator-vcloud-connector: - image: ernestio/nat-creator-vcloud-connector:1.9.0 + image: ernestio/nat-creator-vcloud-connector:1.10.0 links: - nats depends_on: @@ -185,7 +187,7 @@ services: environment: NATS_URI: nats://nats:4222 nat-updater-vcloud-connector: - image: ernestio/nat-updater-vcloud-connector:1.9.0 + image: ernestio/nat-updater-vcloud-connector:1.10.0 links: - nats depends_on: @@ -197,7 +199,7 @@ services: ports: - 4222:4222 network-creator-vcloud-connector: - image: ernestio/network-creator-vcloud-connector:1.9.0 + image: ernestio/network-creator-vcloud-connector:1.10.0 links: - nats depends_on: @@ -205,7 +207,7 @@ services: environment: NATS_URI: nats://nats:4222 network-deleter-vcloud-connector: - image: ernestio/network-deleter-vcloud-connector:1.9.0 + image: ernestio/network-deleter-vcloud-connector:1.10.0 links: - nats depends_on: @@ -232,7 +234,7 @@ services: redis: image: redis router-creator-vcloud-connector: - image: ernestio/router-creator-vcloud-connector:1.9.0 + image: ernestio/router-creator-vcloud-connector:1.10.0 links: - nats depends_on: @@ -240,7 +242,7 @@ services: environment: NATS_URI: nats://nats:4222 router-deleter-vcloud-connector: - image: ernestio/router-deleter-vcloud-connector:1.9.0 + image: ernestio/router-deleter-vcloud-connector:1.10.0 links: - nats depends_on: @@ -248,7 +250,7 @@ services: environment: NATS_URI: nats://nats:4222 service-store: - image: ernestio/service-store:1.9.0 + image: ernestio/service-store:1.10.0 links: - nats depends_on: @@ -256,7 +258,7 @@ services: environment: NATS_URI: nats://nats:4222 user-store: - image: ernestio/user-store:1.9.0 + image: ernestio/user-store:1.10.0 links: - nats depends_on: @@ -264,7 +266,7 @@ services: environment: NATS_URI: nats://nats:4222 vcloud-definition-mapper: - image: ernestio/vcloud-definition-mapper:1.9.0 + image: ernestio/vcloud-definition-mapper:1.10.0 links: - nats - redis @@ -274,7 +276,7 @@ services: environment: NATS_URI: nats://nats:4222 workflow-manager: - image: ernestio/workflow-manager:1.9.0 + image: ernestio/workflow-manager:1.10.0 links: - nats - redis From 5cdd3d7c087077c6e569f22db46ea8c49ac8fd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Wed, 7 Dec 2016 11:48:04 +0100 Subject: [PATCH 11/14] [#ERNEST-197] : Allow environment overload with "-E" option --- definition.yml | 30 ++++++++++++++++++++++++++++++ setup | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/definition.yml b/definition.yml index ed4ff22..749060f 100644 --- a/definition.yml +++ b/definition.yml @@ -9,6 +9,7 @@ repos: - nats environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE entrypoint: /go/bin/config-store -config /etc/ernest/config.json - name: api-gateway @@ -23,6 +24,7 @@ repos: environment: NATS_URI: 'nats://nats:4222' JWT_SECRET: 'GENERATEDJWTSECRET' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: monit path: git@github.com:ernestio/monit.git @@ -36,6 +38,7 @@ repos: environment: NATS_URI: 'nats://nats:4222' JWT_SECRET: 'GENERATEDJWTSECRET' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: user-store path: git@github.com:ernestio/user-store.git @@ -46,6 +49,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: group-store path: git@github.com:ernestio/group-store.git @@ -56,6 +60,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: datacenter-store path: git@github.com:ernestio/datacenter-store.git @@ -66,6 +71,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: service-store path: git@github.com:ernestio/service-store.git @@ -76,6 +82,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: workflow-manager path: git@github.com:ernestio/workflow-manager.git @@ -88,6 +95,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: definition-mapper path: git@github.com:ernestio/definition-mapper.git @@ -100,6 +108,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: vcloud-definition-mapper path: git@github.com:ernestio/vcloud-definition-mapper.git @@ -112,6 +121,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: aws-definition-mapper path: git@github.com:ernestio/aws-definition-mapper.git @@ -124,6 +134,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: execution-adapter path: git@github.com:ernestio/execution-adapter.git @@ -134,6 +145,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: execution-builder path: git@github.com:ernestio/execution-builder.git @@ -145,6 +157,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: all-all-fake-connector path: git@github.com:ernestio/all-all-fake-connector.git @@ -156,6 +169,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: firewall-creator-vcloud-connector path: git@github.com:ernestio/firewall-creator-vcloud-connector.git @@ -166,6 +180,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: firewall-updater-vcloud-connector path: git@github.com:ernestio/firewall-updater-vcloud-connector.git @@ -176,6 +191,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: instance-creator-vcloud-connector path: git@github.com:ernestio/instance-creator-vcloud-connector.git @@ -186,6 +202,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: instance-deleter-vcloud-connector path: git@github.com:ernestio/instance-deleter-vcloud-connector.git @@ -196,6 +213,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: instance-updater-vcloud-connector path: git@github.com:ernestio/instance-updater-vcloud-connector.git @@ -206,6 +224,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: nat-creator-vcloud-connector path: git@github.com:ernestio/nat-creator-vcloud-connector.git @@ -216,6 +235,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: nat-updater-vcloud-connector path: git@github.com:ernestio/nat-updater-vcloud-connector.git @@ -226,6 +246,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: network-creator-vcloud-connector path: git@github.com:ernestio/network-creator-vcloud-connector.git @@ -236,6 +257,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: network-deleter-vcloud-connector path: git@github.com:ernestio/network-deleter-vcloud-connector.git @@ -246,6 +268,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: router-creator-vcloud-connector path: git@github.com:ernestio/router-creator-vcloud-connector.git @@ -256,6 +279,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: router-deleter-vcloud-connector path: git@github.com:ernestio/router-deleter-vcloud-connector.git @@ -266,6 +290,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: all-all-aws-connector path: git@github.com:ernestio/all-all-aws-connector.git @@ -277,6 +302,7 @@ repos: environment: NATS_URI: 'nats://nats:4222' CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws,rds_cluster.create.aws,rds_cluster.update.aws,rds_cluster.delete.aws,rds_instance.create.aws,rds_instance.update.aws,rds_instance.delete.aws + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: execution-run-salt-connector path: git@github.com:ernestio/execution-run-salt-connector.git @@ -287,6 +313,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: generic-adapter path: git@github.com:ernestio/generic-adapter.git @@ -297,6 +324,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: generic-builder path: git@github.com:ernestio/generic-builder.git @@ -308,6 +336,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: logger path: git@github.com:ernestio/logger.git @@ -318,6 +347,7 @@ repos: NATS_URI: 'nats://nats:4222' ERNEST_LOG_FILE: '/var/logs/ernest.log' ERNEST_LOG_CONFIG: '/etc/ernest/' + ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE volumes: - ./logs/:/var/logs/ - ./config/:/etc/ernest/ diff --git a/setup b/setup index 8a91d70..c3670f8 100755 --- a/setup +++ b/setup @@ -42,6 +42,10 @@ sed -i.bak "s/ERNESTHOST/$ERNESTHOST/g" ./config/nginx/ernest.local && rm ./conf TOKEN=`openssl rand -base64 32` sed -i.bak "s:GENERATEDJWTSECRET:$TOKEN:g" docker-compose.yml && rm docker-compose.yml.bak +echo "In order to make your ernest instance secure, we need you to provide a random string to secure all components:" +read -p "- Crypto key: " CRYPTO_KEY +sed -i.bak "s:CRYPTO_KEY_TEMPLATE:$CRYPTO_KEY:g" docker-compose.yml && rm docker-compose.yml.bak + # Make volume for postgres data mkdir -p postgres/data From 280b6644d4a6e40ab580e045efa34f3cdf3b800d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A0=20Cidre?= Date: Wed, 7 Dec 2016 14:47:32 +0100 Subject: [PATCH 12/14] Automatically generate crypto key --- setup | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup b/setup index c3670f8..0be89d3 100755 --- a/setup +++ b/setup @@ -42,8 +42,7 @@ sed -i.bak "s/ERNESTHOST/$ERNESTHOST/g" ./config/nginx/ernest.local && rm ./conf TOKEN=`openssl rand -base64 32` sed -i.bak "s:GENERATEDJWTSECRET:$TOKEN:g" docker-compose.yml && rm docker-compose.yml.bak -echo "In order to make your ernest instance secure, we need you to provide a random string to secure all components:" -read -p "- Crypto key: " CRYPTO_KEY +CRYPTO_KEY=`openssl rand -base64 32` sed -i.bak "s:CRYPTO_KEY_TEMPLATE:$CRYPTO_KEY:g" docker-compose.yml && rm docker-compose.yml.bak # Make volume for postgres data From 29e38afa891c0fd690940dd79ce6443f51263c9e Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Mon, 12 Dec 2016 16:10:30 +0000 Subject: [PATCH 13/14] ebs mapping --- definition.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/definition.yml b/definition.yml index 749060f..c8b6127 100644 --- a/definition.yml +++ b/definition.yml @@ -301,7 +301,7 @@ repos: - config-store environment: NATS_URI: 'nats://nats:4222' - CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs.create.aws,ebs.update.aws,ebs.delete.aws,rds_cluster.create.aws,rds_cluster.update.aws,rds_cluster.delete.aws,rds_instance.create.aws,rds_instance.update.aws,rds_instance.delete.aws + CONNECTORS: nat.create.aws,nat.update.aws,nat.delete.aws,network.create.aws,network.delete.aws,route53.create.aws,route53.delete.aws,route53.update.aws,s3.create.aws,s3.update.aws,s3.delete.aws,elb.create.aws,elb.delete.aws,elb.update.aws,vpc.create.aws,vpc.delete.aws,instance.delete.aws,instance.update.aws,instance.create.aws,firewall.create.aws,firewall.update.aws,firewall.delete.aws,ebs_volume.create.aws,ebs_volume.delete.aws,rds_cluster.create.aws,rds_cluster.update.aws,rds_cluster.delete.aws,rds_instance.create.aws,rds_instance.update.aws,rds_instance.delete.aws ERNEST_CRYPTO_KEY: CRYPTO_KEY_TEMPLATE - name: execution-run-salt-connector @@ -351,4 +351,3 @@ repos: volumes: - ./logs/:/var/logs/ - ./config/:/etc/ernest/ - From d6edd9e924f3e5b0d663c50e24ed2fbe4fb2f798 Mon Sep 17 00:00:00 2001 From: Tom Bevan Date: Mon, 12 Dec 2016 18:39:40 +0000 Subject: [PATCH 14/14] fixed crypto key length --- setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup b/setup index 0be89d3..68627f7 100755 --- a/setup +++ b/setup @@ -42,7 +42,7 @@ sed -i.bak "s/ERNESTHOST/$ERNESTHOST/g" ./config/nginx/ernest.local && rm ./conf TOKEN=`openssl rand -base64 32` sed -i.bak "s:GENERATEDJWTSECRET:$TOKEN:g" docker-compose.yml && rm docker-compose.yml.bak -CRYPTO_KEY=`openssl rand -base64 32` +CRYPTO_KEY=`openssl rand -base64 24` sed -i.bak "s:CRYPTO_KEY_TEMPLATE:$CRYPTO_KEY:g" docker-compose.yml && rm docker-compose.yml.bak # Make volume for postgres data