From 20039860eb958e6866c5cce402d87c768a99b553 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 15 Oct 2013 22:31:57 +1100 Subject: [PATCH] Moved cloud66 config out of .cloud66 into config/cloud/cloud66 it is way too prominent as the first folder in github Amended documentation to point to it from the install guide in the alternative section Removed callout from the ubuntu guide, as it is unrelated --- {.cloud66 => config/cloud/cloud66}/deploy_hooks.yml | 0 {.cloud66 => config/cloud/cloud66}/files/Procfile | 0 {.cloud66 => config/cloud/cloud66}/files/production.rb | 0 {.cloud66 => config/cloud/cloud66}/files/redis.yml | 0 {.cloud66 => config/cloud/cloud66}/files/thin.yml | 0 {.cloud66 => config/cloud/cloud66}/manifest.yml | 0 {.cloud66 => config/cloud/cloud66}/scripts/curl.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/drop_create.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/env_vars.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/import_dev.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/import_prod.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/kill_db.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/migrate.sh | 0 {.cloud66 => config/cloud/cloud66}/scripts/permissions.sh | 0 docs/INSTALL-ubuntu.md | 8 -------- docs/INSTALL.md | 3 ++- 16 files changed, 2 insertions(+), 9 deletions(-) rename {.cloud66 => config/cloud/cloud66}/deploy_hooks.yml (100%) rename {.cloud66 => config/cloud/cloud66}/files/Procfile (100%) rename {.cloud66 => config/cloud/cloud66}/files/production.rb (100%) rename {.cloud66 => config/cloud/cloud66}/files/redis.yml (100%) rename {.cloud66 => config/cloud/cloud66}/files/thin.yml (100%) rename {.cloud66 => config/cloud/cloud66}/manifest.yml (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/curl.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/drop_create.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/env_vars.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/import_dev.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/import_prod.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/kill_db.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/migrate.sh (100%) rename {.cloud66 => config/cloud/cloud66}/scripts/permissions.sh (100%) diff --git a/.cloud66/deploy_hooks.yml b/config/cloud/cloud66/deploy_hooks.yml similarity index 100% rename from .cloud66/deploy_hooks.yml rename to config/cloud/cloud66/deploy_hooks.yml diff --git a/.cloud66/files/Procfile b/config/cloud/cloud66/files/Procfile similarity index 100% rename from .cloud66/files/Procfile rename to config/cloud/cloud66/files/Procfile diff --git a/.cloud66/files/production.rb b/config/cloud/cloud66/files/production.rb similarity index 100% rename from .cloud66/files/production.rb rename to config/cloud/cloud66/files/production.rb diff --git a/.cloud66/files/redis.yml b/config/cloud/cloud66/files/redis.yml similarity index 100% rename from .cloud66/files/redis.yml rename to config/cloud/cloud66/files/redis.yml diff --git a/.cloud66/files/thin.yml b/config/cloud/cloud66/files/thin.yml similarity index 100% rename from .cloud66/files/thin.yml rename to config/cloud/cloud66/files/thin.yml diff --git a/.cloud66/manifest.yml b/config/cloud/cloud66/manifest.yml similarity index 100% rename from .cloud66/manifest.yml rename to config/cloud/cloud66/manifest.yml diff --git a/.cloud66/scripts/curl.sh b/config/cloud/cloud66/scripts/curl.sh similarity index 100% rename from .cloud66/scripts/curl.sh rename to config/cloud/cloud66/scripts/curl.sh diff --git a/.cloud66/scripts/drop_create.sh b/config/cloud/cloud66/scripts/drop_create.sh similarity index 100% rename from .cloud66/scripts/drop_create.sh rename to config/cloud/cloud66/scripts/drop_create.sh diff --git a/.cloud66/scripts/env_vars.sh b/config/cloud/cloud66/scripts/env_vars.sh similarity index 100% rename from .cloud66/scripts/env_vars.sh rename to config/cloud/cloud66/scripts/env_vars.sh diff --git a/.cloud66/scripts/import_dev.sh b/config/cloud/cloud66/scripts/import_dev.sh similarity index 100% rename from .cloud66/scripts/import_dev.sh rename to config/cloud/cloud66/scripts/import_dev.sh diff --git a/.cloud66/scripts/import_prod.sh b/config/cloud/cloud66/scripts/import_prod.sh similarity index 100% rename from .cloud66/scripts/import_prod.sh rename to config/cloud/cloud66/scripts/import_prod.sh diff --git a/.cloud66/scripts/kill_db.sh b/config/cloud/cloud66/scripts/kill_db.sh similarity index 100% rename from .cloud66/scripts/kill_db.sh rename to config/cloud/cloud66/scripts/kill_db.sh diff --git a/.cloud66/scripts/migrate.sh b/config/cloud/cloud66/scripts/migrate.sh similarity index 100% rename from .cloud66/scripts/migrate.sh rename to config/cloud/cloud66/scripts/migrate.sh diff --git a/.cloud66/scripts/permissions.sh b/config/cloud/cloud66/scripts/permissions.sh similarity index 100% rename from .cloud66/scripts/permissions.sh rename to config/cloud/cloud66/scripts/permissions.sh diff --git a/docs/INSTALL-ubuntu.md b/docs/INSTALL-ubuntu.md index 4159ac50b19..9d6169be21a 100644 --- a/docs/INSTALL-ubuntu.md +++ b/docs/INSTALL-ubuntu.md @@ -396,11 +396,3 @@ This change should also be made to your production file. We take security very seriously at Discourse, and all our code is 100% open source and peer reviewed. Please read [our security guide](https://github.com/discourse/discourse/blob/master/docs/SECURITY.md) for an overview of security measures in Discourse. - -## Deploying with Cloud 66 - -![Logo](http://cdn.cloud66.com/images/easy-deploy.png) - - -Deploying and maintaining a Discourse setup through Cloud 66 is extremely easy. -Click the badge and follow these [instructions](https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud66.md) to deploy! diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 932dc100e3b..5dead8441bd 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -10,7 +10,7 @@ Still interested? ### [**Click here for the OFFICIAL INSTALL GUIDE**][1] -Alternately, you can try the [unofficial Heroku install guide][2], or the [BitNami Discourse Virtual Machine package][3]. +Alternately, you can try the [unofficial Heroku install guide][2], the [BitNami Discourse Virtual Machine package][3] or [Cloud66][4]. ## Quick and Dirty Install @@ -43,3 +43,4 @@ Remember you *will* need swap enabled (enough for a total of 4 GB, so 2 GB swap [1]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-ubuntu.md [2]: https://github.com/discourse/discourse/blob/master/docs/HEROKU.md [3]: http://bitnami.com/stack/discourse +[4]: https://github.com/discourse/discourse/blob/master/docs/INSTALL-cloud66.md