Skip to content

Commit b8e4ceb

Browse files
add support for install in LXCcontainers
1 parent 2cd295d commit b8e4ceb

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

tasks/install.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
---
2+
- name: check if inside container
3+
command: grep -qa container=lxc /proc/1/environ
4+
register: container_env
5+
6+
- name: set fact inside container
7+
set_fact:
8+
inside_container: "{% if container_env.rc == 0 %}True{% else %}False{% endif %}"
9+
210
- name: enable overcommit in sysctl
311
sysctl:
412
name: vm.overcommit_memory
513
value: "1"
614
state: present
715
reload: yes
816
ignoreerrors: yes
9-
when: redis_travis_ci is not defined
17+
when:
18+
- redis_travis_ci is not defined
19+
- container_env.rc != 0
1020

1121
- name: compile redis
1222
shell: umask 0022 && make -j{{ ansible_processor_cores|default(1) + 1 }}{{ ' 32bit' if redis_make_32bit|bool else '' }}

templates/default/redis.service.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_oom_score_adjust }}
1818
{% endif %}
1919

2020
UMask=007
21-
PrivateTmp=yes
21+
PrivateTmp={{ 'no' if inside_container else 'yes' }}
2222
LimitNOFILE={{ redis_nofile_limit }}
23-
PrivateDevices=yes
24-
ProtectHome=yes
23+
PrivateDevices={{ 'no' if inside_container else 'yes' }}
24+
ProtectHome={{ 'no' if inside_container else 'yes' }}
2525
ReadOnlyDirectories=/
2626
ReadWriteDirectories=-{{ redis_dir }}
2727
{% if redis_logfile != '""' %}

templates/default/redis_sentinel.service.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ OOMScoreAdjust={{ redis_sentinel_oom_score_adjust }}
1818
{% endif %}
1919

2020
UMask=007
21-
PrivateTmp=yes
21+
PrivateTmp={{ 'no' if inside_container else 'yes' }}
2222
LimitNOFILE={{ redis_nofile_limit }}
23-
PrivateDevices=yes
24-
ProtectHome=yes
23+
PrivateDevices={{ 'no' if inside_container else 'yes' }}
24+
ProtectHome={{ 'no' if inside_container else 'yes' }}
2525
ReadOnlyDirectories=/
2626
ReadWriteDirectories=-{{ redis_sentinel_dir }}
2727
{% if redis_sentinel_logfile != '""' %}

0 commit comments

Comments
 (0)