From 5adf79d63a64bdaf20dc53498eb08145a63cd30d Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Tue, 10 Apr 2018 19:59:03 +0200 Subject: [PATCH 4/5] deploy-tenants: place tmp in src folder, to enable copy module to work both on localhost and remote installations --- group_vars/all | 1 + roles/deploy-tenants/tasks/main.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/group_vars/all b/group_vars/all index e65cacf..2e23b4f 100644 --- a/group_vars/all +++ b/group_vars/all @@ -2,6 +2,7 @@ compile_theme: true django_version: 1.8.18 git_ssh: false src_dir: "/home/{{user}}/src" +tmp_dir: "{{src_dir}}/tmp" ssl_certificate: "/etc/ssl/certs/*.local.publik.crt" ssl_certificate_key: "/etc/ssl/private/*.local.publik.key" venv: "/home/{{user}}/envs/publik-env" diff --git a/roles/deploy-tenants/tasks/main.yml b/roles/deploy-tenants/tasks/main.yml index 5a579b5..9c1a18b 100644 --- a/roles/deploy-tenants/tasks/main.yml +++ b/roles/deploy-tenants/tasks/main.yml @@ -5,24 +5,24 @@ - name : compile site-options.cfg template: src: templates/site-options.cfg.j2 - dest: "/tmp/site-options.cfg" + dest: "{{tmp_dir}}/site-options.cfg" - name : compile config.json template: src: templates/config.json.j2 - dest: "/tmp/config.json" + dest: "{{tmp_dir}}/config.json" - name: "Zips the {{wcs_skeleton_filename}} cook configuration bundle" archive: path: - - /tmp/site-options.cfg - - /tmp/config.json - dest: /tmp/{{wcs_skeleton_filename}} + - "{{tmp_dir}}/site-options.cfg" + - "{{tmp_dir}}/config.json" + dest: "{{tmp_dir}}/{{wcs_skeleton_filename}}" format: zip - name : copies a wcs skeleton archive copy: - src: "/tmp/{{wcs_skeleton_filename}}" + src: "{{tmp_dir}}/{{wcs_skeleton_filename}}" dest: "/var/lib/wcs/skeletons/{{wcs_skeleton_filename}}" - name: copies a cook json template -- 2.11.0