Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
iHile committed Aug 9, 2017
2 parents 1c9e204 + 89c6fa5 commit c696cd5a4653b7f6e442b46784fc7b99f6eaee57
View
@@ -202,7 +202,7 @@ export ISOLATE_BACKEND;
ISOLATE_REDIS_HOST="127.0.0.1";
ISOLATE_REDIS_PORT="6379";
ISOLATE_REDIS_DB=0;
ISOLATE_REDIS_PASS="te2uth4dohLi8i"; # /etc/redis.conf
ISOLATE_REDIS_PASS="te2uth4dohLi8i"; # ansible/roles/redis/vars/main.yml
export ISOLATE_REDIS_HOST;
export ISOLATE_REDIS_PORT;
export ISOLATE_REDIS_PASS;
@@ -35,9 +35,9 @@
- set_fact:
support_key: "{{ pub_key['stdout'] }}"
- name: Copying add-support-user.sh template...
template: src=add-support-user.sh dest=/opt/auth/add-support-user.sh mode=644 owner={{ auth_default_user }} group={{ auth_default_user }}
#
#- name: Copying add-support-user.sh template...
# template: src=add-support-user.sh dest=/opt/auth/add-support-user.sh mode=644 owner={{ auth_default_user }} group={{ auth_default_user }}
- name: Unset deploy flag...
become: yes
@@ -10,9 +10,6 @@
- name: Making xip www root...
file: state=directory dest=/var/www/xip owner=root group=root mode=0755
- name: Copying add-support-user.sh template...
template: src=add-support-user.sh dest=/var/www/xip/add-support-user.sh mode=644
- name: Installing Nginx repo...
copy: src=nginx.repo dest="/etc/yum.repos.d/nginx.repo"
tags: nginx-install
@@ -480,7 +480,7 @@ slave-priority 100
# requirepass {{ redis_pass }}
# for debug only
requirepass te2uth4dohLi8i
requirepass {{ redis_pass }}
# Command renaming.
#
@@ -347,7 +347,7 @@ slave-priority 100
#
# requirepass foobared
requirepass te2uth4dohLi8i
requirepass {{ redis_pass }}
# Command renaming.
#
@@ -78,7 +78,7 @@ bind 127.0.0.1
# even if no authentication is configured, nor a specific set of interfaces
# are explicitly listed using the "bind" directive.
protected-mode no
requirepass te2uth4dohLi8i
requirepass {{ redis_pass }}
# Accept connections on the specified port, default is 6379 (IANA #815344).
# If port 0 is specified Redis will not listen on a TCP socket.
@@ -0,0 +1,2 @@
---
redis_pass: te2uth4dohLi8i

0 comments on commit c696cd5

Please sign in to comment.