ciinabox-ecs 0.2.11.alpha.1529998710 → 0.2.11.alpha.1531180538

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac712cc04f8bbeccf6734dc373151fd1eab30fd273882f2e1e6fc39a94594b32
-  data.tar.gz: 5d0bfef547bfc371e01b6c06a39799187142b2e4b3fce730921086a562808cba
+  metadata.gz: 2d63c6bd2656a587a33c23b3710703aaca7dfa66b7e5c9343ac120c9848b919a
+  data.tar.gz: aa4e7602c4a47929fea59874f0603685f80422479c0bca452d27b0474cfb596f
 SHA512:
-  metadata.gz: 5d3214479c3c4113134c49355beef800d9d610074fc3064a15970cc750dd2298dbe6f98d07dac388cfe14c5bf452fb64191a374c08d8f066cec19b501490b3c5
-  data.tar.gz: d6be939e1983a2352b7335c1b354233bd869df8b7d039697ab8be79d85e8593f85d8adbe4758344feace7bf2486050917885ec61c8d5a18d5a6d9247fd54dd8e
+  metadata.gz: 0877f6b0e84142a1ba131c16379a9b31a75fecb607a780f1a28c8b12342b1bd1b1e6f511a9afb4e94e2f6a854b97ecbb71c772a3bdc2be9fdf26e661aa80930c
+  data.tar.gz: 95473503052cb5c7951c55420f2cdb6050cab7e402ebfedec6b8a561bed14a2d6441aab6650b95f224a37da5ba4466b2d061740d3b783e3e2162bf005a5c1b2f

data/templates/ecs-cluster.rb

@@ -134,6 +134,12 @@ CloudFormation {
     end
   end
 
+  proxy_config_userdata = ''
+  if defined? proxy_config
+    proxy_config_userdata = "mkdir -p /opt/proxy && " +
+                            "echo \"#{proxy_config}\" >> /opt/proxy/proxy_config.conf\n"
+  end
+
   ecs_allow_sg_ingress = [
     { IpProtocol: 'tcp', FromPort: '32768', ToPort: '65535', CidrIp: FnJoin( "", [ FnFindInMap('EnvironmentType','ciinabox','NetworkPrefix'),".", FnFindInMap('EnvironmentType','ciinabox','StackOctet'), ".0.0/",FnFindInMap('EnvironmentType','ciinabox','StackMask') ] ) },
   ]
@@ -162,27 +168,12 @@ CloudFormation {
     if not ecs_block_device_mapping.empty?
       Property("BlockDeviceMappings", ecs_block_device_mapping)
     end
-    if defined? proxy_config
-      Metadata(
-        'AWS::CloudFormation::Init': {
-          config: {
-            files: {
-              '/opt/proxy/proxy_config.conf': {
-                content: proxy_config,
-                mode: "000644",
-                owner: "root",
-                group: "root"
-              }
-            }
-          }
-        }
-      )
-    end
     UserData FnBase64(FnJoin("", [
         "#!/bin/bash\n",
         "echo ECS_CLUSTER=", Ref('ECSCluster'), " >> /etc/ecs/ecs.config\n",
         "INSTANCE_ID=$(echo `/opt/aws/bin/ec2-metadata -i | cut -f2 -d:`)\n",
         "PRIVATE_IP=`/opt/aws/bin/ec2-metadata -o | cut -f2 -d: | cut -f2 -d-`\n",
+        "#{proxy_config_userdata}",
         "yum install -y python-pip\n",
         "python-pip install --upgrade awscli\n",
         "/usr/local/bin/aws --region ", Ref("AWS::Region"), " ec2 attach-volume --volume-id ", Ref(volume_name), " --instance-id ${INSTANCE_ID} --device /dev/sdf\n",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciinabox-ecs
 version: !ruby/object:Gem::Version
-  version: 0.2.11.alpha.1529998710
+  version: 0.2.11.alpha.1531180538
 platform: ruby
 authors:
 - Base2Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake