From 677b7393b5e5fc5d1598e820d1ee78c2b0727e60 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 24 Aug 2015 09:58:45 -0700
Subject: Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk

---
 docker/0.6/Dockerrun.aws.json                          |  13 -------------
 docker/0.6/Dockerrun.aws.zip                           | Bin 0 -> 867 bytes
 docker/0.6/Dockerrun.aws/.ebextensions/01_files.config |  14 ++++++++++++++
 docker/0.6/Dockerrun.aws/Dockerrun.aws.json            |  13 +++++++++++++
 docker/dev/Dockerrun.aws.json                          |  13 -------------
 docker/dev/Dockerrun.aws.zip                           | Bin 0 -> 866 bytes
 docker/dev/Dockerrun.aws/.ebextensions/01_files.config |  14 ++++++++++++++
 docker/dev/Dockerrun.aws/Dockerrun.aws.json            |  13 +++++++++++++
 8 files changed, 54 insertions(+), 26 deletions(-)
 delete mode 100755 docker/0.6/Dockerrun.aws.json
 create mode 100644 docker/0.6/Dockerrun.aws.zip
 create mode 100644 docker/0.6/Dockerrun.aws/.ebextensions/01_files.config
 create mode 100755 docker/0.6/Dockerrun.aws/Dockerrun.aws.json
 delete mode 100755 docker/dev/Dockerrun.aws.json
 create mode 100644 docker/dev/Dockerrun.aws.zip
 create mode 100644 docker/dev/Dockerrun.aws/.ebextensions/01_files.config
 create mode 100755 docker/dev/Dockerrun.aws/Dockerrun.aws.json

(limited to 'docker')

diff --git a/docker/0.6/Dockerrun.aws.json b/docker/0.6/Dockerrun.aws.json
deleted file mode 100755
index f6f7cf726..000000000
--- a/docker/0.6/Dockerrun.aws.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "AWSEBDockerrunVersion": "1",
-  "Image": {
-    "Name": "mattermost/platform:0.6",
-    "Update": "true"
-  },
-  "Ports": [
-    {
-      "ContainerPort": "80"
-    }
-  ],
-  "Logging": "/var/log/"
-}
diff --git a/docker/0.6/Dockerrun.aws.zip b/docker/0.6/Dockerrun.aws.zip
new file mode 100644
index 000000000..342c1549a
Binary files /dev/null and b/docker/0.6/Dockerrun.aws.zip differ
diff --git a/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config b/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config
new file mode 100644
index 000000000..7f40a8b34
--- /dev/null
+++ b/docker/0.6/Dockerrun.aws/.ebextensions/01_files.config
@@ -0,0 +1,14 @@
+files:
+    "/etc/nginx/conf.d/proxy.conf":
+      mode: "000755"
+      owner: root
+      group: root
+      content: |
+        client_max_body_size 50M;
+    "/opt/elasticbeanstalk/hooks/appdeploy/post/init.sh":
+      mode: "000755"
+      owner: root
+      group: root
+      content: |
+        #!/usr/bin/env bash
+        gpasswd -a ec2-user docker 
diff --git a/docker/0.6/Dockerrun.aws/Dockerrun.aws.json b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json
new file mode 100755
index 000000000..f6f7cf726
--- /dev/null
+++ b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json
@@ -0,0 +1,13 @@
+{
+  "AWSEBDockerrunVersion": "1",
+  "Image": {
+    "Name": "mattermost/platform:0.6",
+    "Update": "true"
+  },
+  "Ports": [
+    {
+      "ContainerPort": "80"
+    }
+  ],
+  "Logging": "/var/log/"
+}
diff --git a/docker/dev/Dockerrun.aws.json b/docker/dev/Dockerrun.aws.json
deleted file mode 100755
index ae847ef80..000000000
--- a/docker/dev/Dockerrun.aws.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "AWSEBDockerrunVersion": "1",
-  "Image": {
-    "Name": "mattermost/platform:dev",
-    "Update": "true"
-  },
-  "Ports": [
-    {
-      "ContainerPort": "80"
-    }
-  ],
-  "Logging": "/var/log/"
-}
diff --git a/docker/dev/Dockerrun.aws.zip b/docker/dev/Dockerrun.aws.zip
new file mode 100644
index 000000000..722072d69
Binary files /dev/null and b/docker/dev/Dockerrun.aws.zip differ
diff --git a/docker/dev/Dockerrun.aws/.ebextensions/01_files.config b/docker/dev/Dockerrun.aws/.ebextensions/01_files.config
new file mode 100644
index 000000000..7f40a8b34
--- /dev/null
+++ b/docker/dev/Dockerrun.aws/.ebextensions/01_files.config
@@ -0,0 +1,14 @@
+files:
+    "/etc/nginx/conf.d/proxy.conf":
+      mode: "000755"
+      owner: root
+      group: root
+      content: |
+        client_max_body_size 50M;
+    "/opt/elasticbeanstalk/hooks/appdeploy/post/init.sh":
+      mode: "000755"
+      owner: root
+      group: root
+      content: |
+        #!/usr/bin/env bash
+        gpasswd -a ec2-user docker 
diff --git a/docker/dev/Dockerrun.aws/Dockerrun.aws.json b/docker/dev/Dockerrun.aws/Dockerrun.aws.json
new file mode 100755
index 000000000..ae847ef80
--- /dev/null
+++ b/docker/dev/Dockerrun.aws/Dockerrun.aws.json
@@ -0,0 +1,13 @@
+{
+  "AWSEBDockerrunVersion": "1",
+  "Image": {
+    "Name": "mattermost/platform:dev",
+    "Update": "true"
+  },
+  "Ports": [
+    {
+      "ContainerPort": "80"
+    }
+  ],
+  "Logging": "/var/log/"
+}
-- 
cgit v1.2.3-1-g7c22