move deis controller to separate project

deis · Mar 18, 2014 · 822762f · 822762f
1 parent 60da28e
commit 822762f
Show file tree

Hide file tree

Showing 144 changed files with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,8 +38,8 @@ nosetests.xml
 *.sublime-workspace
 
 # Deis' config file
-deis/local_settings.py
-.secret_key
+controller/deis/local_settings.py
+controller/.secret_key
 
 # deis application logs
 logs/

diff --git a/Procfile → controller/Procfile b/Procfile → controller/Procfile
diff --git a/api/__init__.py → controller/api/__init__.py b/api/__init__.py → controller/api/__init__.py
diff --git a/api/admin.py → controller/api/admin.py b/api/admin.py → controller/api/admin.py
diff --git a/api/docker.py → controller/api/docker.py b/api/docker.py → controller/api/docker.py
diff --git a/api/exceptions.py → controller/api/exceptions.py b/api/exceptions.py → controller/api/exceptions.py
diff --git a/api/fields.py → controller/api/fields.py b/api/fields.py → controller/api/fields.py
diff --git a/api/fixtures/dev.json → controller/api/fixtures/dev.json b/api/fixtures/dev.json → controller/api/fixtures/dev.json
diff --git a/api/fixtures/test_auth.json → controller/api/fixtures/test_auth.json b/api/fixtures/test_auth.json → controller/api/fixtures/test_auth.json
diff --git a/api/fixtures/test_sharing.json → controller/api/fixtures/test_sharing.json b/api/fixtures/test_sharing.json → controller/api/fixtures/test_sharing.json
diff --git a/api/fixtures/tests.json → controller/api/fixtures/tests.json b/api/fixtures/tests.json → controller/api/fixtures/tests.json
diff --git a/api/migrations/0001_initial.py → controller/api/migrations/0001_initial.py b/api/migrations/0001_initial.py → controller/api/migrations/0001_initial.py
diff --git a/api/migrations/0002_drop_djcelery.py → ...ller/api/migrations/0002_drop_djcelery.py b/api/migrations/0002_drop_djcelery.py → ...ller/api/migrations/0002_drop_djcelery.py
diff --git a/api/migrations/0003_drop_socialaccount.py → ...api/migrations/0003_drop_socialaccount.py b/api/migrations/0003_drop_socialaccount.py → ...api/migrations/0003_drop_socialaccount.py
diff --git a/api/migrations/0004_add_custom_perms.py → ...r/api/migrations/0004_add_custom_perms.py b/api/migrations/0004_add_custom_perms.py → ...r/api/migrations/0004_add_custom_perms.py
diff --git a/...to__add_push__add_unique_push_app_uuid.py → ...to__add_push__add_unique_push_app_uuid.py b/...to__add_push__add_unique_push_app_uuid.py → ...to__add_push__add_unique_push_app_uuid.py
diff --git a/...s/0006_auto__add_field_release_summary.py → ...s/0006_auto__add_field_release_summary.py b/...s/0006_auto__add_field_release_summary.py → ...s/0006_auto__add_field_release_summary.py
diff --git a/api/migrations/__init__.py → controller/api/migrations/__init__.py b/api/migrations/__init__.py → controller/api/migrations/__init__.py
diff --git a/api/models.py → controller/api/models.py b/api/models.py → controller/api/models.py
diff --git a/api/routers.py → controller/api/routers.py b/api/routers.py → controller/api/routers.py
diff --git a/api/serializers.py → controller/api/serializers.py b/api/serializers.py → controller/api/serializers.py
diff --git a/api/ssh.py → controller/api/ssh.py b/api/ssh.py → controller/api/ssh.py
diff --git a/api/static/500.html → controller/api/static/500.html b/api/static/500.html → controller/api/static/500.html
diff --git a/api/tasks.py → controller/api/tasks.py b/api/tasks.py → controller/api/tasks.py
diff --git a/api/tests/__init__.py → controller/api/tests/__init__.py b/api/tests/__init__.py → controller/api/tests/__init__.py
diff --git a/api/tests/test_app.py → controller/api/tests/test_app.py b/api/tests/test_app.py → controller/api/tests/test_app.py
diff --git a/api/tests/test_auth.py → controller/api/tests/test_auth.py b/api/tests/test_auth.py → controller/api/tests/test_auth.py
diff --git a/api/tests/test_build.py → controller/api/tests/test_build.py b/api/tests/test_build.py → controller/api/tests/test_build.py
diff --git a/api/tests/test_config.py → controller/api/tests/test_config.py b/api/tests/test_config.py → controller/api/tests/test_config.py
diff --git a/api/tests/test_container.py → controller/api/tests/test_container.py b/api/tests/test_container.py → controller/api/tests/test_container.py
diff --git a/api/tests/test_flavor.py → controller/api/tests/test_flavor.py b/api/tests/test_flavor.py → controller/api/tests/test_flavor.py
diff --git a/api/tests/test_formation.py → controller/api/tests/test_formation.py b/api/tests/test_formation.py → controller/api/tests/test_formation.py
diff --git a/api/tests/test_hooks.py → controller/api/tests/test_hooks.py b/api/tests/test_hooks.py → controller/api/tests/test_hooks.py
diff --git a/api/tests/test_key.py → controller/api/tests/test_key.py b/api/tests/test_key.py → controller/api/tests/test_key.py
diff --git a/api/tests/test_layer.py → controller/api/tests/test_layer.py b/api/tests/test_layer.py → controller/api/tests/test_layer.py
diff --git a/api/tests/test_node.py → controller/api/tests/test_node.py b/api/tests/test_node.py → controller/api/tests/test_node.py
diff --git a/api/tests/test_perm.py → controller/api/tests/test_perm.py b/api/tests/test_perm.py → controller/api/tests/test_perm.py
diff --git a/api/tests/test_provider.py → controller/api/tests/test_provider.py b/api/tests/test_provider.py → controller/api/tests/test_provider.py
diff --git a/api/tests/test_release.py → controller/api/tests/test_release.py b/api/tests/test_release.py → controller/api/tests/test_release.py
diff --git a/api/urls.py → controller/api/urls.py b/api/urls.py → controller/api/urls.py
diff --git a/api/utils.py → controller/api/utils.py b/api/utils.py → controller/api/utils.py
diff --git a/api/views.py → controller/api/views.py b/api/views.py → controller/api/views.py
diff --git a/cm/__init__.py → controller/cm/__init__.py b/cm/__init__.py → controller/cm/__init__.py
diff --git a/cm/chef.py → controller/cm/chef.py b/cm/chef.py → controller/cm/chef.py
diff --git a/cm/chef_api.py → controller/cm/chef_api.py b/cm/chef_api.py → controller/cm/chef_api.py
diff --git a/cm/chef_rsa.py → controller/cm/chef_rsa.py b/cm/chef_rsa.py → controller/cm/chef_rsa.py
diff --git a/cm/mock.py → controller/cm/mock.py b/cm/mock.py → controller/cm/mock.py
diff --git a/cm/models.py → controller/cm/models.py b/cm/models.py → controller/cm/models.py
diff --git a/cm/tests.py → controller/cm/tests.py b/cm/tests.py → controller/cm/tests.py
diff --git a/deis/.gitignore → controller/deis/.gitignore b/deis/.gitignore → controller/deis/.gitignore
diff --git a/deis/__init__.py → controller/deis/__init__.py b/deis/__init__.py → controller/deis/__init__.py
diff --git a/deis/celery.py → controller/deis/celery.py b/deis/celery.py → controller/deis/celery.py
diff --git a/deis/context_processors.py → controller/deis/context_processors.py b/deis/context_processors.py → controller/deis/context_processors.py
diff --git a/deis/settings.py → controller/deis/settings.py b/deis/settings.py → controller/deis/settings.py
diff --git a/deis/urls.py → controller/deis/urls.py b/deis/urls.py → controller/deis/urls.py
diff --git a/deis/wsgi.py → controller/deis/wsgi.py b/deis/wsgi.py → controller/deis/wsgi.py
diff --git a/dev_requirements.txt → controller/dev_requirements.txt b/dev_requirements.txt → controller/dev_requirements.txt
diff --git a/manage.py → controller/manage.py b/manage.py → controller/manage.py
diff --git a/provider/__init__.py → controller/provider/__init__.py b/provider/__init__.py → controller/provider/__init__.py
diff --git a/provider/digitalocean.py → controller/provider/digitalocean.py b/provider/digitalocean.py → controller/provider/digitalocean.py
diff --git a/provider/ec2.py → controller/provider/ec2.py b/provider/ec2.py → controller/provider/ec2.py
diff --git a/provider/mock.py → controller/provider/mock.py b/provider/mock.py → controller/provider/mock.py
diff --git a/provider/models.py → controller/provider/models.py b/provider/models.py → controller/provider/models.py
diff --git a/provider/rackspace.py → controller/provider/rackspace.py b/provider/rackspace.py → controller/provider/rackspace.py
diff --git a/provider/static.py → controller/provider/static.py b/provider/static.py → controller/provider/static.py
diff --git a/provider/tests.py → controller/provider/tests.py b/provider/tests.py → controller/provider/tests.py
diff --git a/provider/vagrant.py → controller/provider/vagrant.py b/provider/vagrant.py → controller/provider/vagrant.py
diff --git a/requirements.txt → controller/requirements.txt b/requirements.txt → controller/requirements.txt
diff --git a/setup.cfg → controller/setup.cfg b/setup.cfg → controller/setup.cfg
diff --git a/web/__init__.py → controller/web/__init__.py b/web/__init__.py → controller/web/__init__.py
diff --git a/web/fixtures/test_web.json → controller/web/fixtures/test_web.json b/web/fixtures/test_web.json → controller/web/fixtures/test_web.json
diff --git a/web/models.py → controller/web/models.py b/web/models.py → controller/web/models.py
diff --git a/web/static/css/bootstrap-responsive.min.css → ...b/static/css/bootstrap-responsive.min.css b/web/static/css/bootstrap-responsive.min.css → ...b/static/css/bootstrap-responsive.min.css
diff --git a/web/static/css/bootstrap.min.css → controller/web/static/css/bootstrap.min.css b/web/static/css/bootstrap.min.css → controller/web/static/css/bootstrap.min.css
diff --git a/web/static/css/deis-controller.css → ...roller/web/static/css/deis-controller.css b/web/static/css/deis-controller.css → ...roller/web/static/css/deis-controller.css
diff --git a/web/static/css/deis-docs.css → controller/web/static/css/deis-docs.css b/web/static/css/deis-docs.css → controller/web/static/css/deis-docs.css
diff --git a/web/static/css/main.css → controller/web/static/css/main.css b/web/static/css/main.css → controller/web/static/css/main.css
diff --git a/web/static/favicon.ico → controller/web/static/favicon.ico b/web/static/favicon.ico → controller/web/static/favicon.ico
diff --git a/web/static/img/404.png → controller/web/static/img/404.png b/web/static/img/404.png → controller/web/static/img/404.png
diff --git a/web/static/img/aws-ec2.png → controller/web/static/img/aws-ec2.png b/web/static/img/aws-ec2.png → controller/web/static/img/aws-ec2.png
diff --git a/web/static/img/blog-social.png → controller/web/static/img/blog-social.png b/web/static/img/blog-social.png → controller/web/static/img/blog-social.png
diff --git a/web/static/img/cover-image.png → controller/web/static/img/cover-image.png b/web/static/img/cover-image.png → controller/web/static/img/cover-image.png
diff --git a/web/static/img/deis-graphic.png → controller/web/static/img/deis-graphic.png b/web/static/img/deis-graphic.png → controller/web/static/img/deis-graphic.png
diff --git a/web/static/img/deis_builder.png → controller/web/static/img/deis_builder.png b/web/static/img/deis_builder.png → controller/web/static/img/deis_builder.png
diff --git a/web/static/img/deis_logo.png → controller/web/static/img/deis_logo.png b/web/static/img/deis_logo.png → controller/web/static/img/deis_logo.png
diff --git a/web/static/img/favicon.png → controller/web/static/img/favicon.png b/web/static/img/favicon.png → controller/web/static/img/favicon.png
diff --git a/web/static/img/fork.png → controller/web/static/img/fork.png b/web/static/img/fork.png → controller/web/static/img/fork.png
diff --git a/web/static/img/glyphs.png → controller/web/static/img/glyphs.png b/web/static/img/glyphs.png → controller/web/static/img/glyphs.png
diff --git a/web/static/img/large-social.png → controller/web/static/img/large-social.png b/web/static/img/large-social.png → controller/web/static/img/large-social.png
diff --git a/web/static/img/logo.png → controller/web/static/img/logo.png b/web/static/img/logo.png → controller/web/static/img/logo.png
diff --git a/web/static/img/mag_glass.png → controller/web/static/img/mag_glass.png b/web/static/img/mag_glass.png → controller/web/static/img/mag_glass.png
diff --git a/web/static/img/menu-logo.png → controller/web/static/img/menu-logo.png b/web/static/img/menu-logo.png → controller/web/static/img/menu-logo.png
diff --git a/web/static/img/social.png → controller/web/static/img/social.png b/web/static/img/social.png → controller/web/static/img/social.png
diff --git a/web/static/js/adjustments.js → controller/web/static/js/adjustments.js b/web/static/js/adjustments.js → controller/web/static/js/adjustments.js
diff --git a/web/static/js/bootstrap.min.js → controller/web/static/js/bootstrap.min.js b/web/static/js/bootstrap.min.js → controller/web/static/js/bootstrap.min.js
diff --git a/web/static/js/checkURL.js → controller/web/static/js/checkURL.js b/web/static/js/checkURL.js → controller/web/static/js/checkURL.js
diff --git a/web/static/js/jquery-1.10.2.min.js → ...roller/web/static/js/jquery-1.10.2.min.js b/web/static/js/jquery-1.10.2.min.js → ...roller/web/static/js/jquery-1.10.2.min.js
diff --git a/...c/js/modernizr-2.6.2-respond-1.1.0.min.js → ...c/js/modernizr-2.6.2-respond-1.1.0.min.js b/...c/js/modernizr-2.6.2-respond-1.1.0.min.js → ...c/js/modernizr-2.6.2-respond-1.1.0.min.js
diff --git a/web/templates/account/base.html → controller/web/templates/account/base.html b/web/templates/account/base.html → controller/web/templates/account/base.html
diff --git a/web/templates/account/email.html → controller/web/templates/account/email.html b/web/templates/account/email.html → controller/web/templates/account/email.html
diff --git a/...ount/email/email_confirmation_message.txt → ...ount/email/email_confirmation_message.txt b/...ount/email/email_confirmation_message.txt → ...ount/email/email_confirmation_message.txt
diff --git a/...ail/email_confirmation_signup_message.txt → ...ail/email_confirmation_signup_message.txt b/...ail/email_confirmation_signup_message.txt → ...ail/email_confirmation_signup_message.txt
diff --git a/...ail/email_confirmation_signup_subject.txt → ...ail/email_confirmation_signup_subject.txt b/...ail/email_confirmation_signup_subject.txt → ...ail/email_confirmation_signup_subject.txt
diff --git a/...ount/email/email_confirmation_subject.txt → ...ount/email/email_confirmation_subject.txt b/...ount/email/email_confirmation_subject.txt → ...ount/email/email_confirmation_subject.txt
diff --git a/...ount/email/password_reset_key_message.txt → ...ount/email/password_reset_key_message.txt b/...ount/email/password_reset_key_message.txt → ...ount/email/password_reset_key_message.txt
diff --git a/...ount/email/password_reset_key_subject.txt → ...ount/email/password_reset_key_subject.txt b/...ount/email/password_reset_key_subject.txt → ...ount/email/password_reset_key_subject.txt
diff --git a/web/templates/account/email_confirm.html → .../web/templates/account/email_confirm.html b/web/templates/account/email_confirm.html → .../web/templates/account/email_confirm.html
diff --git a/web/templates/account/email_confirmed.html → ...eb/templates/account/email_confirmed.html b/web/templates/account/email_confirmed.html → ...eb/templates/account/email_confirmed.html
diff --git a/web/templates/account/login.html → controller/web/templates/account/login.html b/web/templates/account/login.html → controller/web/templates/account/login.html
diff --git a/web/templates/account/logout.html → controller/web/templates/account/logout.html b/web/templates/account/logout.html → controller/web/templates/account/logout.html
diff --git a/.../messages/cannot_delete_primary_email.txt → .../messages/cannot_delete_primary_email.txt b/.../messages/cannot_delete_primary_email.txt → .../messages/cannot_delete_primary_email.txt
diff --git a/...ount/messages/email_confirmation_sent.txt → ...ount/messages/email_confirmation_sent.txt b/...ount/messages/email_confirmation_sent.txt → ...ount/messages/email_confirmation_sent.txt
diff --git a/...ates/account/messages/email_confirmed.txt → ...ates/account/messages/email_confirmed.txt b/...ates/account/messages/email_confirmed.txt → ...ates/account/messages/email_confirmed.txt
diff --git a/...plates/account/messages/email_deleted.txt → ...plates/account/messages/email_deleted.txt b/...plates/account/messages/email_deleted.txt → ...plates/account/messages/email_deleted.txt
diff --git a/web/templates/account/messages/logged_in.txt → .../templates/account/messages/logged_in.txt b/web/templates/account/messages/logged_in.txt → .../templates/account/messages/logged_in.txt
diff --git a/...templates/account/messages/logged_out.txt → ...templates/account/messages/logged_out.txt b/...templates/account/messages/logged_out.txt → ...templates/account/messages/logged_out.txt
diff --git a/...tes/account/messages/password_changed.txt → ...tes/account/messages/password_changed.txt b/...tes/account/messages/password_changed.txt → ...tes/account/messages/password_changed.txt
diff --git a/...mplates/account/messages/password_set.txt → ...mplates/account/messages/password_set.txt b/...mplates/account/messages/password_set.txt → ...mplates/account/messages/password_set.txt
diff --git a/...es/account/messages/primary_email_set.txt → ...es/account/messages/primary_email_set.txt b/...es/account/messages/primary_email_set.txt → ...es/account/messages/primary_email_set.txt
diff --git a/...unt/messages/unverified_primary_email.txt → ...unt/messages/unverified_primary_email.txt b/...unt/messages/unverified_primary_email.txt → ...unt/messages/unverified_primary_email.txt
diff --git a/web/templates/account/password_change.html → ...eb/templates/account/password_change.html b/web/templates/account/password_change.html → ...eb/templates/account/password_change.html
diff --git a/web/templates/account/password_delete.html → ...eb/templates/account/password_delete.html b/web/templates/account/password_delete.html → ...eb/templates/account/password_delete.html
diff --git a/...mplates/account/password_delete_done.html → ...mplates/account/password_delete_done.html b/...mplates/account/password_delete_done.html → ...mplates/account/password_delete_done.html
diff --git a/web/templates/account/password_reset.html → ...web/templates/account/password_reset.html b/web/templates/account/password_reset.html → ...web/templates/account/password_reset.html
diff --git a/...emplates/account/password_reset_done.html → ...emplates/account/password_reset_done.html b/...emplates/account/password_reset_done.html → ...emplates/account/password_reset_done.html
diff --git a/...ates/account/password_reset_from_key.html → ...ates/account/password_reset_from_key.html b/...ates/account/password_reset_from_key.html → ...ates/account/password_reset_from_key.html
diff --git a/...account/password_reset_from_key_done.html → ...account/password_reset_from_key_done.html b/...account/password_reset_from_key_done.html → ...account/password_reset_from_key_done.html
diff --git a/web/templates/account/password_set.html → ...r/web/templates/account/password_set.html b/web/templates/account/password_set.html → ...r/web/templates/account/password_set.html
diff --git a/web/templates/account/signup.html → controller/web/templates/account/signup.html b/web/templates/account/signup.html → controller/web/templates/account/signup.html
diff --git a/web/templates/account/signup_closed.html → .../web/templates/account/signup_closed.html b/web/templates/account/signup_closed.html → .../web/templates/account/signup_closed.html
diff --git a/...s/account/snippets/already_logged_in.html → ...s/account/snippets/already_logged_in.html b/...s/account/snippets/already_logged_in.html → ...s/account/snippets/already_logged_in.html
diff --git a/web/templates/account/verification_sent.html → .../templates/account/verification_sent.html b/web/templates/account/verification_sent.html → .../templates/account/verification_sent.html
diff --git a/...ates/account/verified_email_required.html → ...ates/account/verified_email_required.html b/...ates/account/verified_email_required.html → ...ates/account/verified_email_required.html
diff --git a/web/templates/web/account.html → controller/web/templates/web/account.html b/web/templates/web/account.html → controller/web/templates/web/account.html
diff --git a/web/templates/web/apps.html → controller/web/templates/web/apps.html b/web/templates/web/apps.html → controller/web/templates/web/apps.html
diff --git a/web/templates/web/base.html → controller/web/templates/web/base.html b/web/templates/web/base.html → controller/web/templates/web/base.html
diff --git a/web/templates/web/dashboard.html → controller/web/templates/web/dashboard.html b/web/templates/web/dashboard.html → controller/web/templates/web/dashboard.html
diff --git a/web/templates/web/formations.html → controller/web/templates/web/formations.html b/web/templates/web/formations.html → controller/web/templates/web/formations.html
diff --git a/web/templates/web/support.html → controller/web/templates/web/support.html b/web/templates/web/support.html → controller/web/templates/web/support.html
diff --git a/web/templatetags/__init__.py → controller/web/templatetags/__init__.py b/web/templatetags/__init__.py → controller/web/templatetags/__init__.py
diff --git a/web/templatetags/gravatar_tags.py → controller/web/templatetags/gravatar_tags.py b/web/templatetags/gravatar_tags.py → controller/web/templatetags/gravatar_tags.py
diff --git a/web/tests.py → controller/web/tests.py b/web/tests.py → controller/web/tests.py
diff --git a/web/urls.py → controller/web/urls.py b/web/urls.py → controller/web/urls.py
diff --git a/web/views.py → controller/web/views.py b/web/views.py → controller/web/views.py