[task-230] [mod] install path

This commit is contained in:
roydfalk 2024-12-30 14:55:58 +01:00
parent bacbc78b2e
commit 4319326513
2 changed files with 11 additions and 11 deletions

View file

@ -27,41 +27,41 @@
"ansible.builtin.git": { "ansible.builtin.git": {
"repo": "{{var_tandoor_repository_url}}", "repo": "{{var_tandoor_repository_url}}",
"version": "{{var_tandoor_repository_reference}}", "version": "{{var_tandoor_repository_reference}}",
"dest": "{{var_tandoor_directory}}" "dest": "{{var_tandoor_directory}}/program"
} }
}, },
{ {
"name": "python requirements", "name": "python requirements",
"ansible.builtin.pip": { "ansible.builtin.pip": {
"virtualenv": "{{var_tandoor_directory}}", "virtualenv": "{{var_tandoor_directory}}/program",
"requirements": "{{var_tandoor_directory}}/requirements.txt" "requirements": "{{var_tandoor_directory}}/program/requirements.txt"
} }
}, },
{ {
"name": "database", "name": "database",
"ansible.builtin.shell": { "ansible.builtin.shell": {
"environment": "VIRTUAL_ENV={{var_tandoor_directory}}", "environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
"cmd": "bin/python3 manage.py migrate" "cmd": "bin/python3 manage.py migrate"
} }
}, },
{ {
"name": "static files", "name": "static files",
"ansible.builtin.shell": { "ansible.builtin.shell": {
"environment": "VIRTUAL_ENV={{var_tandoor_directory}}", "environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
"cmd": "bin/python3 manage.py collectstatic --no-input" "cmd": "bin/python3 manage.py collectstatic --no-input"
} }
}, },
{ {
"name": "static files", "name": "static files",
"ansible.builtin.shell": { "ansible.builtin.shell": {
"environment": "VIRTUAL_ENV={{var_tandoor_directory}}", "environment": "VIRTUAL_ENV={{var_tandoor_directory}}/program",
"cmd": "bin/python3 manage.py collectstatic_js_reverse" "cmd": "bin/python3 manage.py collectstatic_js_reverse"
} }
}, },
{ {
"name": "frontend stuff", "name": "frontend stuff",
"ansible.builtin.shell": { "ansible.builtin.shell": {
"chdir": "{{var_tandoor_directory}}/vue", "chdir": "{{var_tandoor_directory}}/program/vue",
"cmd": "yarn install && yarn build" "cmd": "yarn install && yarn build"
} }
}, },
@ -69,7 +69,7 @@
"name": "configuration", "name": "configuration",
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "conf.j2", "src": "conf.j2",
"dest": "{{var_tandoor_directory}}/.env" "dest": "{{var_tandoor_directory}}/program/.env"
} }
}, },
{ {

View file

@ -3,10 +3,10 @@ Description=Tandoor
After=multi-user.target After=multi-user.target
[Service] [Service]
WorkingDirectory={{var_tandoor_directory}} WorkingDirectory={{var_tandoor_directory}}/program
User={{var_tandoor_user}} User={{var_tandoor_user}}
# Environment="VIRTUAL_ENV={{var_tandoor_directory}}" # Environment="VIRTUAL_ENV={{var_tandoor_directory}}/program"
ExecStart="{{var_tandoor_directory}}/bin/python3 manage.py runserver" ExecStart="{{var_tandoor_directory}}/program/bin/python3 manage.py runserver"
SyslogIdentifier=tandoor SyslogIdentifier=tandoor
[Install] [Install]