Revert DEPLOY_FOLDER environment variable (#115)

plone · Nov 26, 2024 · 91cd1e6 · 91cd1e6
1 parent e0d452f
commit 91cd1e6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git a/project/cookiecutter.json b/project/cookiecutter.json
@@ -52,7 +52,7 @@
   "__devops_traefik_stack_include_ui": "no",
   "__devops_traefik_docker_network": "{{ cookiecutter.__devops_stack_name }}_{{ cookiecutter.__devops_swarm_stack_network }}",
   "__devops_varnish_version": "7.6",
-  "__devops_db_version": "14",
+  "__devops_db_version": "14.15",
   "__devops_db_password": "{{ random_ascii_string(12) }}",
   "__backend_addon_git_initialize": "0",
   "__backend_addon_format": "1",

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/.env_dist b/project/{{ cookiecutter.__folder_name }}/devops/.env_dist
@@ -3,6 +3,5 @@ DEPLOY_ENV=prod
 DEPLOY_HOST={{ cookiecutter.hostname }}
 DEPLOY_PORT=22
 DEPLOY_USER=plone
-DEPLOY_FOLDER=/srv/{{ cookiecutter.project_slug }}/data
 DOCKER_CONFIG=.docker
 STACK_NAME={{ cookiecutter.__devops_stack_name }}
diff --git a/project/{{ cookiecutter.__folder_name }}/devops/README.md b/project/{{ cookiecutter.__folder_name }}/devops/README.md
@@ -46,7 +46,6 @@ DEPLOY_ENV=prod
 DEPLOY_HOST={{ cookiecutter.hostname }}
 DEPLOY_PORT=22
 DEPLOY_USER=plone
-DEPLOY_FOLDER=/srv/{{ cookiecutter.project_slug }}/data
 DOCKER_CONFIG=.docker
 STACK_NAME={{ cookiecutter.__devops_stack_name }}
 ```

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/projects.yml b/project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/projects.yml
@@ -1,7 +1,6 @@
 ---
 project_folders:
-  # Path to store {{ cookiecutter.hostname }} postgres data
-  - path: {{ "\"{{ lookup('ansible.builtin.env', 'DEPLOY_FOLDER', default='/srv/plone/data') }}\"" }}
+  - path: "/srv/{{ cookiecutter.project_slug }}/data"
     owner: 999
     group: 999
     mode: "0750"
diff --git a/project/{{ cookiecutter.__folder_name }}/devops/stacks/{{ cookiecutter.hostname }}.yml b/project/{{ cookiecutter.__folder_name }}/devops/stacks/{{ cookiecutter.hostname }}.yml
@@ -249,7 +249,7 @@ volumes:
   vol-site-data:
     driver_opts:
       type: none
-      device: ${DEPLOY_FOLDER:-/srv/{{ cookiecutter.project_slug }}/data}
+      device: "/srv/{{ cookiecutter.project_slug }}/data"
       o: bind
 
 networks: