diff --git a/tasks/install.yml b/tasks/install.yml index 62ae34a8..b3f1b949 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -1,4 +1,13 @@ --- +- name: check if inside container + command: grep -qa container=lxc /proc/1/environ + register: container_env + ignore_errors: yes + +- name: set fact inside container + set_fact: + inside_container: "{% if container_env.rc == 0 %}True{% else %}False{% endif %}" + - name: enable overcommit in sysctl sysctl: name: vm.overcommit_memory @@ -6,7 +15,9 @@ state: present reload: yes ignoreerrors: yes - when: redis_travis_ci is not defined + when: + - redis_travis_ci is not defined + - container_env.rc != 0 - name: compile redis shell: umask 0022 && make -j{{ ansible_processor_cores|default(1) + 1 }}{{ ' 32bit' if redis_make_32bit|bool else '' }} diff --git a/templates/default/redis.service.j2 b/templates/default/redis.service.j2 index 4bfb7b81..0798beaf 100644 --- a/templates/default/redis.service.j2 +++ b/templates/default/redis.service.j2 @@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_oom_score_adjust }} {% endif %} UMask=007 -PrivateTmp=yes +PrivateTmp={{ 'no' if inside_container else 'yes' }} LimitNOFILE={{ redis_nofile_limit }} -PrivateDevices=yes -ProtectHome=yes +PrivateDevices={{ 'no' if inside_container else 'yes' }} +ProtectHome={{ 'no' if inside_container else 'yes' }} ReadOnlyDirectories=/ ReadWriteDirectories=-{{ redis_dir }} {% if redis_logfile != '""' %} diff --git a/templates/default/redis_sentinel.service.j2 b/templates/default/redis_sentinel.service.j2 index a8593d52..c4df7abd 100644 --- a/templates/default/redis_sentinel.service.j2 +++ b/templates/default/redis_sentinel.service.j2 @@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_sentinel_oom_score_adjust }} {% endif %} UMask=007 -PrivateTmp=yes +PrivateTmp={{ 'no' if inside_container else 'yes' }} LimitNOFILE={{ redis_nofile_limit }} -PrivateDevices=yes -ProtectHome=yes +PrivateDevices={{ 'no' if inside_container else 'yes' }} +ProtectHome={{ 'no' if inside_container else 'yes' }} ReadOnlyDirectories=/ ReadWriteDirectories=-{{ redis_sentinel_dir }} {% if redis_sentinel_logfile != '""' %}