[incubator-openwhisk] branch master updated: Change the confdir for the default environments. (#2973)

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 0c9420b  Change the confdir for the default environments. (#2973)
0c9420b is described below

commit 0c9420b57770457dcd45454943d429b0bd3df562
Author: Christian Bickel <gi...@cbickel.de>
AuthorDate: Mon Nov 20 13:22:51 2017 +0100

    Change the confdir for the default environments. (#2973)
---
 ansible/environments/distributed/group_vars/all    | 2 +-
 ansible/environments/docker-machine/group_vars/all | 2 +-
 ansible/environments/local/group_vars/all          | 2 +-
 ansible/roles/nginx/tasks/clean.yml                | 9 +++++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ansible/environments/distributed/group_vars/all b/ansible/environments/distributed/group_vars/all
index 5335800..6fbfe03 100755
--- a/ansible/environments/distributed/group_vars/all
+++ b/ansible/environments/distributed/group_vars/all
@@ -8,7 +8,7 @@ db_host: "{{ groups['db'] | first }}"
 db_prefix: whisk_distributed_
 
 whisk_version_name: distributed
-config_root_dir: /tmp
+config_root_dir: /tmp/wskconf
 whisk_logs_dir: /tmp/wsklogs
 registry_storage_dir: "/"
 docker_registry: "{{ groups['registry'] | first }}:5000/"
diff --git a/ansible/environments/docker-machine/group_vars/all b/ansible/environments/docker-machine/group_vars/all
index 20f7228..9e8a93c 100644
--- a/ansible/environments/docker-machine/group_vars/all
+++ b/ansible/environments/docker-machine/group_vars/all
@@ -1,5 +1,5 @@
 whisk_version_name: mac
-config_root_dir: /Users/Shared
+config_root_dir: /Users/Shared/wskconf
 whisk_logs_dir: /Users/Shared/wsklogs
 docker_registry: ""
 docker_dns: ""
diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all
index d99d85e..3860f33 100755
--- a/ansible/environments/local/group_vars/all
+++ b/ansible/environments/local/group_vars/all
@@ -1,5 +1,5 @@
 whisk_version_name: local
-config_root_dir: /tmp
+config_root_dir: /tmp/wskconf
 whisk_logs_dir: /tmp/wsklogs
 docker_registry: ""
 docker_dns: ""
diff --git a/ansible/roles/nginx/tasks/clean.yml b/ansible/roles/nginx/tasks/clean.yml
index eada58d..2988b89 100644
--- a/ansible/roles/nginx/tasks/clean.yml
+++ b/ansible/roles/nginx/tasks/clean.yml
@@ -14,6 +14,15 @@
     state: absent
   become: "{{ nginx.dir.become }}"
 
+# As I changed the location of the log directory, this task will still remove the old config directory
+# This step will be removed soon again.
+- name: remove old config directory
+  file:
+    path: "{{ nginx.confdir | regex_replace('wskconf/nginx$', 'nginx') }}"
+    state: absent
+  become: "{{ nginx.dir.become }}"
+  when: nginx.confdir | match(".*/wskconf/nginx")
+
 - name: remove nginx log directory
   file:
     path: "{{ whisk_logs_dir }}/nginx"

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].