From 711f94ad36c16a94d86cb6d1a0d00e55e67c6ad0 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Mon, 15 May 2017 15:43:04 +0200 Subject: [PATCH] TT#11462 use postgresql psycopg2 as database backend engine * update dependencies due postgresql * fake files needed to deploy at debian * add new needed config values at server.ini file Change-Id: I02699c721ac79a0328da07a4c2e3a2cb1451d403 --- Makefile | 1 - debian/control | 6 +++++- debian/gerrit.ini | 3 +++ debian/install | 2 +- debian/rules | 14 ++++++-------- debian/secret_key | 1 + debian/server.ini | 7 +++++++ repoapi/settings/prod.py | 22 +++++++++++++--------- requirements/prod.txt | 1 + 9 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 debian/gerrit.ini create mode 100644 debian/secret_key create mode 100644 debian/server.ini diff --git a/Makefile b/Makefile index 6115004..67cb608 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,6 @@ deploy: venv_prod migrate: venv_prod source $(VAR_DIR)/venv_prod/bin/activate && \ ./manage.py migrate --settings="repoapi.settings.prod" - chown www-data:www-data $(VAR_DIR)/db.sqlite3 shell: venv_prod source $(VAR_DIR)/venv_prod/bin/activate && \ diff --git a/debian/control b/debian/control index 50eb8f1..80c3325 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Maintainer: Sipwise Development Team Build-Depends: debhelper (>= 8~), dh-systemd (>= 1.5), + libpq-dev, python-dev, virtualenv, Standards-Version: 3.9.7 @@ -14,9 +15,12 @@ Package: repoapi Section: python Architecture: all Depends: + build-essential, + libpq-dev, make, + postgresql, python, - sqlite3, + python-dev, uwsgi, uwsgi-plugin-python, virtualenv, diff --git a/debian/gerrit.ini b/debian/gerrit.ini new file mode 100644 index 0000000..cd71015 --- /dev/null +++ b/debian/gerrit.ini @@ -0,0 +1,3 @@ +[gerrit] +HTTP_USER=fake +HTTP_PASSWD=fakeHTTPpass diff --git a/debian/install b/debian/install index 2a21d7e..960072a 100644 --- a/debian/install +++ b/debian/install @@ -1,5 +1,5 @@ -hotfix usr/share/repoapi Makefile usr/share/repoapi +hotfix usr/share/repoapi manage.py usr/share/repoapi panel usr/share/repoapi release_dashboard usr/share/repoapi diff --git a/debian/rules b/debian/rules index 756c6cf..291a0de 100755 --- a/debian/rules +++ b/debian/rules @@ -14,15 +14,13 @@ override_dh_auto_test: +override_dh_auto_build: + # fake files needed to deploy + cp debian/secret_key .secret_key + cp debian/gerrit.ini gerrit.ini + cp debian/server.ini server.ini + override_dh_auto_install: - echo "fakesecretkey" > .secret_key - echo "[gerrit]" > gerrit.ini - echo "HTTP_USER=fake" >> gerrit.ini - echo "HTTP_PASSWD=fakeHTTPpass" >> gerrit.ini - echo "[server]" > server.ini - echo "JENKINS_URL=fake" >> server.ini - echo "GERRIT_URL=fake" >> server.ini - echo "BROKER_URL=fake" >> server.ini VAR_DIR=$(shell pwd) make deploy make clean diff --git a/debian/secret_key b/debian/secret_key new file mode 100644 index 0000000..1da3110 --- /dev/null +++ b/debian/secret_key @@ -0,0 +1 @@ +fakesecretkey diff --git a/debian/server.ini b/debian/server.ini new file mode 100644 index 0000000..607b407 --- /dev/null +++ b/debian/server.ini @@ -0,0 +1,7 @@ +[server] +JENKINS_URL=fake +GERRIT_URL=fake +BROKER_URL=fake +DB_NAME=fake +DB_USER=fake +DB_PWD=fake diff --git a/repoapi/settings/prod.py b/repoapi/settings/prod.py index 683128a..9ac9b30 100644 --- a/repoapi/settings/prod.py +++ b/repoapi/settings/prod.py @@ -40,23 +40,27 @@ ALLOWED_HOSTS = ['.mgm.sipwise.com'] INSTALLED_APPS.extend(PROJECT_APPS) +LOGGING['loggers']['repoapi']['level'] = os.getenv('DJANGO_LOG_LEVEL', 'INFO') + +server_config = RawConfigParser() +server_config.read(os.path.join(VAR_DIR, 'server.ini')) +JENKINS_URL = server_config.get('server', 'JENKINS_URL') +GERRIT_URL = server_config.get('server', 'GERRIT_URL') + # Database # https://docs.djangoproject.com/en/1.8/ref/settings/#databases DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(VAR_DIR, 'db.sqlite3'), + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': server_config.get('server', 'DB_NAME'), + 'USER': server_config.get('server', 'DB_USER'), + 'PASSWORD': server_config.get('server', 'DB_PWD'), + 'HOST': 'localhost', + 'PORT': '', } } -LOGGING['loggers']['repoapi']['level'] = os.getenv('DJANGO_LOG_LEVEL', 'INFO') - -server_config = RawConfigParser() -server_config.read(os.path.join(VAR_DIR, 'server.ini')) -JENKINS_URL = server_config.get('server', 'JENKINS_URL') -GERRIT_URL = server_config.get('server', 'GERRIT_URL') - gerrit_config = RawConfigParser() gerrit_config.read(os.path.join(VAR_DIR, 'gerrit.ini')) GERRIT_REST_HTTP_USER = gerrit_config.get('gerrit', 'HTTP_USER') diff --git a/requirements/prod.txt b/requirements/prod.txt index 6624a30..25780b5 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -1 +1,2 @@ -r common.txt +psycopg2