diff --git a/Procfile b/Procfile index 22a362d..421ced3 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: uwsgi --http :$PORT --module publichealthschweiz.wsgi --master --offload-threads 1 +web: uwsgi --http :$PORT --module publichealth.wsgi --master --offload-threads 1 diff --git a/Vagrantfile b/Vagrantfile index 57b0601..603d477 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -69,7 +69,7 @@ Vagrant.configure(2) do |config| # sudo apt-get update # sudo apt-get install -y apache2 # SHELL - config.vm.provision :shell, :path => "vagrant/provision.sh", :args => "publichealthschweiz" + config.vm.provision :shell, :path => "vagrant/provision.sh", :args => "publichealth" # Enable agent forwarding over SSH connections. config.ssh.forward_agent = true diff --git a/bin/post_compile b/bin/post_compile index 671a709..909df68 100644 --- a/bin/post_compile +++ b/bin/post_compile @@ -1 +1 @@ -python manage.py compress --settings publichealthschweiz.settings.production +python manage.py compress --settings publichealth.settings.production diff --git a/docs/conf.py b/docs/conf.py index e7dbd90..45fcdc5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -164,7 +164,7 @@ html_static_path = ['_static'] #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'publichealthschweizdoc' +htmlhelp_basename = 'publichealthdoc' # -- Options for LaTeX output -------------------------------------------------- @@ -183,7 +183,7 @@ latex_elements = { # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'publichealthschweiz.tex', u'Public Health Schweiz Documentation', + ('index', 'publichealth.tex', u'Public Health Schweiz Documentation', u'ChangeToMyName', 'manual'), ] @@ -213,7 +213,7 @@ latex_documents = [ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'publichealthschweiz', u'Public Health Schweiz Documentation', + ('index', 'publichealth', u'Public Health Schweiz Documentation', [u'ChangeToMyName'], 1) ] @@ -227,8 +227,8 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'publichealthschweiz', u'Public Health Schweiz Documentation', - u'ChangeToMyName', 'publichealthschweiz', 'One line description of project.', + ('index', 'publichealth', u'Public Health Schweiz Documentation', + u'ChangeToMyName', 'publichealth', 'One line description of project.', 'Miscellaneous'), ] diff --git a/fabfile.py b/fabfile.py index 388dbe1..ff51fb8 100644 --- a/fabfile.py +++ b/fabfile.py @@ -74,9 +74,9 @@ def pull_production_data(): _pull_data( env_name='production', - remote_db_name='publichealthschweiz', - local_db_name='publichealthschweiz', - remote_dump_path='/usr/local/django/publichealthschweiz/tmp/', + remote_db_name='publichealth', + local_db_name='publichealth', + remote_dump_path='/usr/local/django/publichealth/tmp/', local_dump_path='/tmp/', ) @@ -88,8 +88,8 @@ def pull_staging_data(): _pull_data( env_name='staging', - remote_db_name='publichealthschweiz', - local_db_name='publichealthschweiz', - remote_dump_path='/usr/local/django/publichealthschweiz/tmp/', + remote_db_name='publichealth', + local_db_name='publichealth', + remote_dump_path='/usr/local/django/publichealth/tmp/', local_dump_path='/tmp/', ) diff --git a/manage.py b/manage.py index f905196..e05b9b1 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import os import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "publichealthschweiz.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "publichealth.settings") from django.core.management import execute_from_command_line diff --git a/publichealthschweiz/__init__.py b/publichealth/__init__.py similarity index 100% rename from publichealthschweiz/__init__.py rename to publichealth/__init__.py diff --git a/publichealthschweiz/home/__init__.py b/publichealth/home/__init__.py similarity index 100% rename from publichealthschweiz/home/__init__.py rename to publichealth/home/__init__.py diff --git a/publichealthschweiz/home/migrations/0001_initial.py b/publichealth/home/migrations/0001_initial.py similarity index 100% rename from publichealthschweiz/home/migrations/0001_initial.py rename to publichealth/home/migrations/0001_initial.py diff --git a/publichealthschweiz/home/migrations/0002_create_homepage.py b/publichealth/home/migrations/0002_create_homepage.py similarity index 100% rename from publichealthschweiz/home/migrations/0002_create_homepage.py rename to publichealth/home/migrations/0002_create_homepage.py diff --git a/publichealthschweiz/home/migrations/__init__.py b/publichealth/home/migrations/__init__.py similarity index 100% rename from publichealthschweiz/home/migrations/__init__.py rename to publichealth/home/migrations/__init__.py diff --git a/publichealthschweiz/home/models.py b/publichealth/home/models.py similarity index 100% rename from publichealthschweiz/home/models.py rename to publichealth/home/models.py diff --git a/publichealthschweiz/home/templates/home/home_page.html b/publichealth/home/templates/home/home_page.html similarity index 100% rename from publichealthschweiz/home/templates/home/home_page.html rename to publichealth/home/templates/home/home_page.html diff --git a/publichealthschweiz/search/__init__.py b/publichealth/search/__init__.py similarity index 100% rename from publichealthschweiz/search/__init__.py rename to publichealth/search/__init__.py diff --git a/publichealthschweiz/search/templates/search/search.html b/publichealth/search/templates/search/search.html similarity index 100% rename from publichealthschweiz/search/templates/search/search.html rename to publichealth/search/templates/search/search.html diff --git a/publichealthschweiz/search/views.py b/publichealth/search/views.py similarity index 100% rename from publichealthschweiz/search/views.py rename to publichealth/search/views.py diff --git a/publichealthschweiz/settings/.gitignore b/publichealth/settings/.gitignore similarity index 100% rename from publichealthschweiz/settings/.gitignore rename to publichealth/settings/.gitignore diff --git a/publichealthschweiz/settings/__init__.py b/publichealth/settings/__init__.py similarity index 100% rename from publichealthschweiz/settings/__init__.py rename to publichealth/settings/__init__.py diff --git a/publichealthschweiz/settings/base.py b/publichealth/settings/base.py similarity index 92% rename from publichealthschweiz/settings/base.py rename to publichealth/settings/base.py index 720aa6a..9d3c0c0 100644 --- a/publichealthschweiz/settings/base.py +++ b/publichealth/settings/base.py @@ -1,5 +1,5 @@ """ -Django settings for publichealthschweiz project. +Django settings for publichealth project. Generated by 'django-admin startproject' using Django 1.8.2. @@ -24,8 +24,8 @@ BASE_DIR = os.path.dirname(PROJECT_DIR) # Application definition INSTALLED_APPS = [ - 'publichealthschweiz.home', - 'publichealthschweiz.search', + 'publichealth.home', + 'publichealth.search', 'wagtail.contrib.wagtailsearchpromotions', 'wagtail.wagtailforms', @@ -65,7 +65,7 @@ MIDDLEWARE_CLASSES = [ 'wagtail.wagtailredirects.middleware.RedirectMiddleware', ] -ROOT_URLCONF = 'publichealthschweiz.urls' +ROOT_URLCONF = 'publichealth.urls' TEMPLATES = [ { @@ -85,7 +85,7 @@ TEMPLATES = [ }, ] -WSGI_APPLICATION = 'publichealthschweiz.wsgi.application' +WSGI_APPLICATION = 'publichealth.wsgi.application' # Database @@ -94,7 +94,7 @@ WSGI_APPLICATION = 'publichealthschweiz.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'publichealthschweiz', + 'NAME': 'publichealth', } } @@ -166,7 +166,7 @@ CACHES = { 'default': { 'BACKEND': 'django_redis.cache.RedisCache', 'LOCATION': '127.0.0.1:6379', - 'KEY_PREFIX': 'publichealthschweiz', + 'KEY_PREFIX': 'publichealth', 'OPTIONS': { 'CLIENT_CLASS': 'django_redis.client.DefaultClient', } @@ -179,7 +179,7 @@ CACHES = { WAGTAILSEARCH_BACKENDS = { 'default': { 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch.ElasticSearch', - 'INDEX': 'publichealthschweiz', + 'INDEX': 'publichealth', }, } diff --git a/publichealthschweiz/settings/dev.py b/publichealth/settings/dev.py similarity index 100% rename from publichealthschweiz/settings/dev.py rename to publichealth/settings/dev.py diff --git a/publichealthschweiz/settings/production.py b/publichealth/settings/production.py similarity index 97% rename from publichealthschweiz/settings/production.py rename to publichealth/settings/production.py index 5e25042..7b6f0a2 100644 --- a/publichealthschweiz/settings/production.py +++ b/publichealth/settings/production.py @@ -34,7 +34,7 @@ for key, value in os.environ.items(): # Basic configuration -APP_NAME = env.get('APP_NAME', 'publichealthschweiz') +APP_NAME = env.get('APP_NAME', 'publichealth') if 'SECRET_KEY' in env: SECRET_KEY = env['SECRET_KEY'] @@ -150,7 +150,7 @@ LOGGING = { } }, 'loggers': { - 'publichealthschweiz': { + 'publichealth': { 'handlers': [], 'level': 'INFO', 'propagate': False, @@ -180,14 +180,14 @@ LOGGING = { if 'LOG_DIR' in env: # Public Health Schweiz log - LOGGING['handlers']['publichealthschweiz_file'] = { + LOGGING['handlers']['publichealth_file'] = { 'level': 'INFO', 'class': 'cloghandler.ConcurrentRotatingFileHandler', - 'filename': os.path.join(env['LOG_DIR'], 'publichealthschweiz.log'), + 'filename': os.path.join(env['LOG_DIR'], 'publichealth.log'), 'maxBytes': 5242880, # 5MB 'backupCount': 5 } - LOGGING['loggers']['wagtail']['handlers'].append('publichealthschweiz_file') + LOGGING['loggers']['wagtail']['handlers'].append('publichealth_file') # Wagtail log LOGGING['handlers']['wagtail_file'] = { diff --git a/publichealthschweiz/static/css/main.scss b/publichealth/static/css/main.scss similarity index 100% rename from publichealthschweiz/static/css/main.scss rename to publichealth/static/css/main.scss diff --git a/publichealthschweiz/static/js/main.js b/publichealth/static/js/main.js similarity index 100% rename from publichealthschweiz/static/js/main.js rename to publichealth/static/js/main.js diff --git a/publichealthschweiz/templates/404.html b/publichealth/templates/404.html similarity index 100% rename from publichealthschweiz/templates/404.html rename to publichealth/templates/404.html diff --git a/publichealthschweiz/templates/500.html b/publichealth/templates/500.html similarity index 100% rename from publichealthschweiz/templates/500.html rename to publichealth/templates/500.html diff --git a/publichealthschweiz/templates/base.html b/publichealth/templates/base.html similarity index 100% rename from publichealthschweiz/templates/base.html rename to publichealth/templates/base.html diff --git a/publichealthschweiz/urls.py b/publichealth/urls.py similarity index 95% rename from publichealthschweiz/urls.py rename to publichealth/urls.py index 555cf15..862dc4e 100644 --- a/publichealthschweiz/urls.py +++ b/publichealth/urls.py @@ -6,7 +6,7 @@ from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls from wagtail.wagtailcore import urls as wagtail_urls -from publichealthschweiz.search import views as search_views +from publichealth.search import views as search_views urlpatterns = [ diff --git a/publichealthschweiz/wsgi.py b/publichealth/wsgi.py similarity index 72% rename from publichealthschweiz/wsgi.py rename to publichealth/wsgi.py index 9e5e501..423e47c 100644 --- a/publichealthschweiz/wsgi.py +++ b/publichealth/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for publichealthschweiz project. +WSGI config for publichealth project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -14,6 +14,6 @@ from whitenoise.django import DjangoWhiteNoise from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "publichealthschweiz.settings.production") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "publichealth.settings.production") application = DjangoWhiteNoise(get_wsgi_application()) diff --git a/stellar.yaml b/stellar.yaml index aeceac5..0afe2e3 100644 --- a/stellar.yaml +++ b/stellar.yaml @@ -1,6 +1,6 @@ logging: 30 migrate_from_0_3_2: false -project_name: publichealthschweiz +project_name: publichealth stellar_url: postgresql+psycopg2:///stellar_data -tracked_databases: [publichealthschweiz] +tracked_databases: [publichealth] url: postgresql+psycopg2:///template1