summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Gologuzov <vgologuz@redhat.com>2015-06-11 15:25:08 +0200
committerValentin Gologuzov <vgologuz@redhat.com>2015-06-11 15:25:08 +0200
commitbe345a397eb227937a90a4732efdebeb7fcab236 (patch)
tree323547baa1ffdbf74d97b0c39665e808b82cfb6c
parentd2af37b90929617a69fa8c32012f16e9ab0fa487 (diff)
[dopr] fixed cdic_update_db script; mkdir /var/run/cdic
-rw-r--r--roles/dopr/files/cdic_update_db.sh4
-rw-r--r--roles/dopr/files/systemd/cdic_async.service2
-rw-r--r--roles/dopr/files/systemd/cdic_gunicorn.service2
-rw-r--r--roles/dopr/tasks/main.yml1
4 files changed, 5 insertions, 4 deletions
diff --git a/roles/dopr/files/cdic_update_db.sh b/roles/dopr/files/cdic_update_db.sh
index aa15ea9ea..eb5374116 100644
--- a/roles/dopr/files/cdic_update_db.sh
+++ b/roles/dopr/files/cdic_update_db.sh
@@ -3,10 +3,10 @@
echo "befor"
-cd ../..
+cd ..
if [ -e /home/cdic/init_done ]; then
echo "db schema upgrade "
- alembic upgrade head
+ PYTHONPATH=cdic:$PYTHONPATH alembic upgrade head
else
echo "initiating db"
PYTHONPATH=.:$PYTHONPATH /usr/bin/python3 cdic/manage.py create_db -f alembic.ini
diff --git a/roles/dopr/files/systemd/cdic_async.service b/roles/dopr/files/systemd/cdic_async.service
index f0af37de6..a704c587d 100644
--- a/roles/dopr/files/systemd/cdic_async.service
+++ b/roles/dopr/files/systemd/cdic_async.service
@@ -6,7 +6,7 @@ Description=cdic async executor daemon
After=network.target
[Service]
-PIDFile=/run/cdic/pid_async
+PIDFile=/var/run/cdic/pid_async
User=cdic
Group=cdic
WorkingDirectory=/home/cdic/server/cdic/src/cdic
diff --git a/roles/dopr/files/systemd/cdic_gunicorn.service b/roles/dopr/files/systemd/cdic_gunicorn.service
index 21fc943e3..290a7c27c 100644
--- a/roles/dopr/files/systemd/cdic_gunicorn.service
+++ b/roles/dopr/files/systemd/cdic_gunicorn.service
@@ -7,7 +7,7 @@ After=cdic_async.service
After=network.target
[Service]
-PIDFile=/run/cdic/pid
+PIDFile=/var/run/cdic/pid
User=cdic
Group=cdic
WorkingDirectory=/home/cdic/server/cdic/src/cdic
diff --git a/roles/dopr/tasks/main.yml b/roles/dopr/tasks/main.yml
index 238c1cbb6..ee8367a1a 100644
--- a/roles/dopr/tasks/main.yml
+++ b/roles/dopr/tasks/main.yml
@@ -64,6 +64,7 @@
- file: path=/var/lib/cdic state=directory mode=0755 owner=cdic group=cdic
- file: path=/var/lib/cdic/openid state=directory mode=0755 owner=cdic group=cdic
- file: path=/var/lib/cdic/wp state=directory mode=0755 owner=cdic group=cdic
+- file: path=/var/run/cdic state=directory mode=0755 owner=cdic group=cdic
- file: path=/home/cdic/.config state=directory mode=0755 owner=cdic group=cdic
- name: copy cdic config