do not hard-code the created username to plone, use the one set in th…

…e .env file (#64)

* do not hard-code the created username to plone, use the one set in the .env file

* set default value for the DEPLOY_USER

* use an environment var for the deploy_folder

* adjust for tests

* fix

* fix name

* this is not an ansible template

project/cookiecutter.json

@@ -116,7 +116,10 @@
     "devops/etc",
     "devops/playbooks",
     "devops/requirements",
-    "devops/tasks"
+    "devops/tasks",
+    "devops/inventory/group_vars/all/users.yml",
+    "devops/inventory/group_vars/all/projects.yml"
+
   ],
   "_extensions": [
     "cookieplone.filters.use_prerelease_versions",

project/{{ cookiecutter.__folder_name }}/devops/.env_dist

@@ -2,5 +2,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 }}

project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/projects.yml

@@ -1,7 +1,7 @@
 ---
 project_folders:
   # Path to store {{ cookiecutter.hostname }} postgres data
-  - path: "/srv/{{ cookiecutter.project_slug }}/data"
+    path: "{{ lookup('ansible.builtin.env', 'DEPLOY_FOLDER', default='/srv/plone/data') }}"
     owner: 999
     group: 999
     mode: "0750"

project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/users.yml

@@ -1,6 +1,6 @@
 ---
 users:
   default:
-    name: plone
+    name: "{{ lookup('ansible.builtin.env', 'DEPLOY_USER', default='plone') }}"
     group: sudo
     additional_keys: []

project/{{ cookiecutter.__folder_name }}/devops/stacks/{{ cookiecutter.hostname }}.yml

@@ -246,7 +246,7 @@ volumes:
   vol-site-data:
     driver_opts:
       type: none
-      device: /srv/{{ cookiecutter.project_slug }}/data
+      device: "${DEPLOY_FOLDER:/srv/{{ cookiecutter.project_slug }}/data}"
       o: bind
 
 networks: