Skip to content

Commit cf7f390

Browse files
author
apps
committed
Merge branch 'master' of github.com:NUKnightLab/StoryMapJS
2 parents 6be96d2 + 66d553d commit cf7f390

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

deploy/config.common.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
project_name: StoryMapJS
22
service_name: "{{ project_name|lower }}"
33
gitdeploy_version: "1.0.6"
4-
python_version: "3.8.2"
5-
python: /home/apps/sites/StoryMapJS/.venv/bin/python
4+
python_version: "3.10.2"
5+
python: /home/apps/sites/StoryMapJS.{{ python_version }}/.venv/bin/python
66
service_port: "{{ storymap_port }}"
77
nginx_template: storymap.conf
88
nginx_client_max_body_size: 20M
@@ -39,11 +39,20 @@ init_env_common:
3939
PG_PASSWORD: "{{ vault_pg_password }}"
4040

4141
install_root: "/home/apps/sites"
42-
deploy_dir: "{{ install_root }}/{{ project_name }}"
43-
application_dir: "{{ deploy_dir }}" # application dir could be a subdirectory
44-
env_file: "{{ deploy_dir }}/.env"
45-
envrc_file: "{{ deploy_dir }}/.envrc"
46-
virtualenv: "{{ deploy_dir }}/.venv"
42+
43+
# We are experimenting with using a project-name symlink to a python-versioned
44+
# deployment location to facilitate virtualenv builds for python upgrades. Ideally,
45+
# this means git-deploy would support these concepts orthogonally without resorting to
46+
# using the application_dir in lieu of the deploy_dir as a path to the environment.
47+
# For now, since the application dir happens to be the root of the repository, it
48+
# seems like this will work, but we may want to re-think some of these variables in
49+
# git-deploy. We may also want to introduce the symlinking as a deployment feature.
50+
51+
deploy_dir: "{{ install_root }}/{{ project_name }}.{{ python_version }}"
52+
application_dir: "{{ install_root }}/{{ project_name }}" # This actually a symlink not managed by git-deploy
53+
env_file: "{{ application_dir }}/.env"
54+
envrc_file: "{{ application_dir }}/.envrc"
55+
virtualenv: "{{ application_dir }}/.venv"
4756
project_repo: "git@github.com:NUKnightLab/{{ project_name }}.git"
48-
requirements_file: "{{ deploy_dir }}/requirements.txt"
57+
requirements_file: "{{ application_dir }}/requirements.txt"
4958
wsgi_application: "storymap.core.wsgi:application"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy