Merge pull request #456 from mattermost/mm-1960

Fixes mm-1960 allows upload of files over 1MB to Elastic Beanstalk

7 files changed, 30 insertions, 2 deletions

diff --git a/README.md b/README.md
index 130c84890..9d8e5dfd3 100644
--- a/README.md
+++ b/README.md
@@ -103,14 +103,14 @@ Local Machine Setup (Docker)
 AWS Elastic Beanstalk Setup (Docker)
 ------------------------------------
 
-1. Create a new Elastic Beanstalk Docker application using the [Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json) file provided. 
+1. Create a new Elastic Beanstalk Docker application using the [Dockerrun.aws.zip](docker/0.6/Dockerrun.aws//Dockerrun.aws.zip) file provided. 
 	1. From the AWS console select Elastic Beanstalk.
 	2. Select "Create New Application" from the top right.
 	3. Name the application and press next.
 	4. Select "Create a web server" environment.
 	5. If asked, select create an IAM role and instance profile and press next.
 	6. For predefined configuration select under Generic: Docker. For environment type select single instance.
-	7. For application source, select upload your own and upload Dockerrun.aws.json from [docker/0.6/Dockerrun.aws.json](docker/0.6/Dockerrun.aws.json). Everything else may be left at default.
+	7. For application source, select upload your own and upload Dockerrun.aws.zip from [Dockerrun.aws.zip](docker/0.6/Dockerrun.aws//Dockerrun.aws.zip). Everything else may be left at default.
 	8. Select an environment name, this is how you will refer to your environment. Make sure the URL is available then press next.
 	9. The options on the additional resources page may be left at default unless you wish to change them. Press Next.
 	10. On the configuration details place. Select an instance type of t2.small or larger.
diff --git a/docker/0.6/Dockerrun.aws.zip b/docker/0.6/Dockerrun.aws.zip
new file mode 100644
index 000000000..342c1549a
--- /dev/null
+++ b/docker/0.6/Dockerrun.aws.zip
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.json b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json
index f6f7cf726..f6f7cf726 100755
--- a/docker/0.6/Dockerrun.aws.json
+++ b/docker/0.6/Dockerrun.aws/Dockerrun.aws.json
diff --git a/docker/dev/Dockerrun.aws.zip b/docker/dev/Dockerrun.aws.zip
new file mode 100644
index 000000000..722072d69
--- /dev/null
+++ b/docker/dev/Dockerrun.aws.zip
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.json b/docker/dev/Dockerrun.aws/Dockerrun.aws.json
index ae847ef80..ae847ef80 100755
--- a/docker/dev/Dockerrun.aws.json
+++ b/docker/dev/Dockerrun.aws/Dockerrun.aws.json