From 3437559d27f131879ec5df7f265954d8fecf1d6c Mon Sep 17 00:00:00 2001 From: Fredrik Steen Date: Wed, 15 Feb 2017 09:39:51 +0100 Subject: [PATCH] Rename of brewpi_django -> fermentrack_django Should only contain, renaming changes. I have tested: - Install from scratch - make secret settings - manage.py migrate - Running under circus - Adding new controllers Everything seems to work as before, new "basepath" is now ~/fermentrack --- app/device_forms.py | 2 +- app/git_integration.py | 2 +- app/models.py | 2 +- app/profile_forms.py | 2 +- app/views.py | 2 +- brewpi-script/brewpi.py | 2 +- circus.ini | 6 +++--- docs/docs/index.md | 2 +- {brewpi_django => fermentrack_django}/__init__.py | 0 {brewpi_django => fermentrack_django}/brewpi_spawner.py | 6 +++--- .../secretsettings.py.example | 0 {brewpi_django => fermentrack_django}/settings.py | 8 ++++---- {brewpi_django => fermentrack_django}/urls.py | 0 {brewpi_django => fermentrack_django}/wsgi.py | 4 ++-- manage.py | 2 +- utils/make_secretsettings.sh | 8 ++++---- 16 files changed, 24 insertions(+), 24 deletions(-) rename {brewpi_django => fermentrack_django}/__init__.py (100%) rename {brewpi_django => fermentrack_django}/brewpi_spawner.py (96%) rename {brewpi_django => fermentrack_django}/secretsettings.py.example (100%) rename {brewpi_django => fermentrack_django}/settings.py (95%) rename {brewpi_django => fermentrack_django}/urls.py (100%) rename {brewpi_django => fermentrack_django}/wsgi.py (70%) diff --git a/app/device_forms.py b/app/device_forms.py index 2e46b83d..11602630 100644 --- a/app/device_forms.py +++ b/app/device_forms.py @@ -1,7 +1,7 @@ from django import forms from app.models import BrewPiDevice, OldControlConstants, NewControlConstants, SensorDevice, FermentationProfile from django.core import validators -import brewpi_django.settings as settings +import fermentrack_django.settings as settings from django.forms import ModelForm diff --git a/app/git_integration.py b/app/git_integration.py index ada0e7d8..7634a0a9 100644 --- a/app/git_integration.py +++ b/app/git_integration.py @@ -1,6 +1,6 @@ from git import Repo -import brewpi_django.settings as settings +import fermentrack_django.settings as settings def local_and_remote_are_at_same_commit(repo, remote): diff --git a/app/models.py b/app/models.py index b3689b18..4795d89a 100644 --- a/app/models.py +++ b/app/models.py @@ -9,7 +9,7 @@ import socket import json, time, datetime, pytz from constance import config -from brewpi_django import settings +from fermentrack_django import settings import re diff --git a/app/profile_forms.py b/app/profile_forms.py index 262b0790..2d10a485 100644 --- a/app/profile_forms.py +++ b/app/profile_forms.py @@ -1,7 +1,7 @@ from django import forms from app.models import FermentationProfile, FermentationProfilePoint from django.core import validators -import brewpi_django.settings as settings +import fermentrack_django.settings as settings from django.forms import ModelForm diff --git a/app/views.py b/app/views.py index ddf7174e..2a59ee17 100644 --- a/app/views.py +++ b/app/views.py @@ -14,7 +14,7 @@ import git_integration import subprocess -import brewpi_django.settings as settings +import fermentrack_django.settings as settings diff --git a/brewpi-script/brewpi.py b/brewpi-script/brewpi.py index 2afd6455..21339b98 100644 --- a/brewpi-script/brewpi.py +++ b/brewpi-script/brewpi.py @@ -22,7 +22,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # This is so Django knows where to find stuff. -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brewpi_django.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fermentrack_django.settings") sys.path.append(BASE_DIR) # This is so my local_settings.py gets loaded. diff --git a/circus.ini b/circus.ini index c2f8c0da..c33d2f41 100644 --- a/circus.ini +++ b/circus.ini @@ -4,10 +4,10 @@ endpoint = tcp://127.0.0.1:5555 pubsub_endpoint = tcp://127.0.0.1:5556 stats_endpoint = tcp://127.0.0.1:5557 loglevel = ERROR -logoutput = $(circus.env.HOME)/brewpi-django/log/circusd.log +logoutput = $(circus.env.HOME)/fermentrack/log/circusd.log [watcher:Fermentrack] -cmd = $(circus.env.HOME)/venv/bin/chaussette --fd $(circus.sockets.Fermentrack) brewpi_django.wsgi:application +cmd = $(circus.env.HOME)/venv/bin/chaussette --fd $(circus.sockets.Fermentrack) fermentrack_django.wsgi:application use_sockets = True numprocesses = 2 @@ -16,7 +16,7 @@ host = 0.0.0.0 port = 8123 [watcher:brewpi-spawner] -cmd = $(circus.env.HOME)/venv/bin/python $(circus.env.HOME)/brewpi-django/brewpi_django/brewpi_spawner.py +cmd = $(circus.env.HOME)/venv/bin/python $(circus.env.HOME)/fermentrack/fermentrack_django/brewpi_spawner.py use_sockets = False numprocesses = 1 diff --git a/docs/docs/index.md b/docs/docs/index.md index a3d1c4ec..a9d12f94 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -54,6 +54,6 @@ Look - I haven't written any documentation for this yet, but I figure everything This is a pretty standard Django app for most intents and purposes. You'll need to create the database (manage.py migrate iirc) - I'm targeting SQLite due to the easy deployment, but nothing prevents using postgres or mysql if that's what you prefer. You'll also need to create a superuser (manage.py createsuperuser) if you want to use the admin. It's optional. -The last thing you'll need to do is create the /brewpi_django/secretsettings.py file. I've created an example of this file called /brewpi_django/secretsettings.py.example . It's basic, for now. +The last thing you'll need to do is create the /fermentrack_django/secretsettings.py file. I've created an example of this file called /fermentrack_django/secretsettings.py.example . It's basic, for now. If you think about the main BrewPi project, you have three main components - BrewPi-www, BrewPi-script, and the BrewPi firmware. This project seeks to replace BrewPi-www, and uses a replacement for BrewPi-script (which is in a subdirectory of the same name). Using this instance of Brewpi-script is mandatory for this project to function. diff --git a/brewpi_django/__init__.py b/fermentrack_django/__init__.py similarity index 100% rename from brewpi_django/__init__.py rename to fermentrack_django/__init__.py diff --git a/brewpi_django/brewpi_spawner.py b/fermentrack_django/brewpi_spawner.py similarity index 96% rename from brewpi_django/brewpi_spawner.py rename to fermentrack_django/brewpi_spawner.py index 1c386a7c..15694c3a 100755 --- a/brewpi_django/brewpi_spawner.py +++ b/fermentrack_django/brewpi_spawner.py @@ -10,7 +10,7 @@ # Load up the Django specific stuff BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # This is so Django knows where to find stuff. -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brewpi_django.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fermentrack_django.settings") sys.path.append(BASE_DIR) from django.core.wsgi import get_wsgi_application application = get_wsgi_application() @@ -30,7 +30,7 @@ def __init__(self, model, sleep_interval=SLEEP_INTERVAL, command_tmpl='python -u brewpi-script/brewpi.py --dbcfg %s', circus_endpoint=DEFAULT_ENDPOINT_DEALER, - logfilepath=os.path.expanduser("~/brewpi-django/log"), + logfilepath=os.path.expanduser("~/fermentrack/log"), log=LOG ): self.prefix = prefix @@ -172,7 +172,7 @@ def run_forvever(self): if __name__ == '__main__': # Chill so that circus has time to startup time.sleep(5) - cmd_tmpl = "python -u " + os.path.expanduser("~/brewpi-django/brewpi-script/brewpi.py") + " --dbcfg %s" + cmd_tmpl = "python -u " + os.path.expanduser("~/fermentrack/brewpi-script/brewpi.py") + " --dbcfg %s" process_spawner = BrewPiSpawner(model=models.BrewPiDevice, command_tmpl=cmd_tmpl, prefix="dev-") process_spawner.run_forvever() diff --git a/brewpi_django/secretsettings.py.example b/fermentrack_django/secretsettings.py.example similarity index 100% rename from brewpi_django/secretsettings.py.example rename to fermentrack_django/secretsettings.py.example diff --git a/brewpi_django/settings.py b/fermentrack_django/settings.py similarity index 95% rename from brewpi_django/settings.py rename to fermentrack_django/settings.py index 72e24b9a..f1ab4593 100644 --- a/brewpi_django/settings.py +++ b/fermentrack_django/settings.py @@ -1,5 +1,5 @@ """ -Django settings for brewpi_django project. +Django settings for fermentrack_django project. Generated by 'django-admin startproject' using Django 1.10.2. @@ -14,7 +14,7 @@ from django.contrib.messages import constants as message_constants # For the messages override import datetime, pytz -from secretsettings import * # See brewpi_django/secretsettings.py.example, or run utils/make_secretsettings.sh +from secretsettings import * # See fermentrack_django/secretsettings.py.example, or run utils/make_secretsettings.sh # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -55,7 +55,7 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -ROOT_URLCONF = 'brewpi_django.urls' +ROOT_URLCONF = 'fermentrack_django.urls' TEMPLATES = [ { @@ -74,7 +74,7 @@ }, ] -WSGI_APPLICATION = 'brewpi_django.wsgi.application' +WSGI_APPLICATION = 'fermentrack_django.wsgi.application' # Database diff --git a/brewpi_django/urls.py b/fermentrack_django/urls.py similarity index 100% rename from brewpi_django/urls.py rename to fermentrack_django/urls.py diff --git a/brewpi_django/wsgi.py b/fermentrack_django/wsgi.py similarity index 70% rename from brewpi_django/wsgi.py rename to fermentrack_django/wsgi.py index defd4387..3bd80747 100644 --- a/brewpi_django/wsgi.py +++ b/fermentrack_django/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for brewpi_django project. +WSGI config for fermentrack_django project. It exposes the WSGI callable as a module-level variable named ``application``. @@ -11,6 +11,6 @@ from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brewpi_django.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fermentrack_django.settings") application = get_wsgi_application() diff --git a/manage.py b/manage.py index 422405cc..6bbf1b43 100755 --- a/manage.py +++ b/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "brewpi_django.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fermentrack_django.settings") try: from django.core.management import execute_from_command_line except ImportError: diff --git a/utils/make_secretsettings.sh b/utils/make_secretsettings.sh index c0968bd5..8636bc10 100755 --- a/utils/make_secretsettings.sh +++ b/utils/make_secretsettings.sh @@ -5,14 +5,14 @@ myPath="$( cd "$( dirname "${BASH_SOURCE[0]}")" && pwd )" # This script populates secretsettings.py (which contains the SECRET_KEY and not much else at the moment # SECRET_KEY is a 50 character alphanumeric string that is used within Django -echo "Generating SECRET_KEY and writing to brewpi_django/secretsettings.py" +echo "Generating SECRET_KEY and writing to fermentrack_django/secretsettings.py" SECRET_KEY_STRING=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 50 | head -n 1) -if [ -f "$myPath/../brewpi_django/secretsettings.py" ]; then +if [ -f "$myPath/../fermentrack_django/secretsettings.py" ]; then echo "Removing old secretsettings.py file.." - rm "$myPath/../brewpi_django/secretsettings.py" # In case it exists + rm "$myPath/../fermentrack_django/secretsettings.py" # In case it exists fi -echo "SECRET_KEY = '${SECRET_KEY_STRING}'" >> "$myPath/../brewpi_django/secretsettings.py" +echo "SECRET_KEY = '${SECRET_KEY_STRING}'" >> "$myPath/../fermentrack_django/secretsettings.py" echo "secretsettings.py created!"