FEATURE: disable huge pages in PG, web and redis

diff --git a/launcher b/launcher
index f34acc9b94778cc4904a389bcdc4c58c4dd4da0b..ae41c18ce3b2d4d284ade0fa49d28bd5b0f8862c 100755 (executable)
--- a/launcher
+++ b/launcher
@@ -64,7 +64,7 @@ git_rec_version='1.8.0'
 config_file=containers/"$config".yml
 cidbootstrap=cids/"$config"_bootstrap.cid
 local_discourse=local_discourse
-image=discourse/base:2.0.20180717
+image=discourse/base:2.0.20180802
 docker_path=`which docker.io || which docker`
 git_path=`which git`
 

diff --git a/templates/postgres.template.yml b/templates/postgres.template.yml
index 30daf5f58b305bae8d414c2f6a19a288042f2955..3214e7cd409896a9c52112a1e3867dffe11354ec 100644 (file)
--- a/templates/postgres.template.yml
+++ b/templates/postgres.template.yml
@@ -36,7 +36,7 @@ run:
      contents: |
         #!/bin/sh
         exec 2>&1
-        HOME=/var/lib/postgresql USER=postgres exec chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
+        HOME=/var/lib/postgresql USER=postgres exec thpoff chpst -u postgres:postgres:ssl-cert -U postgres:postgres:ssl-cert /usr/lib/postgresql/10/bin/postmaster -D /etc/postgresql/10/main
 
   - file:
      path: /etc/service/postgres/log/run

diff --git a/templates/redis.template.yml b/templates/redis.template.yml
index ab9ceb8a2279044cc83215d282b515372906e0d7..c69a7360d02594cd01b128d469a92abe80d6239e 100644 (file)
--- a/templates/redis.template.yml
+++ b/templates/redis.template.yml
@@ -5,7 +5,7 @@ run:
      contents: |
         #!/bin/sh
         exec 2>&1
-        exec chpst -u redis -U redis /usr/bin/redis-server /etc/redis/redis.conf
+        exec thpoff chpst -u redis -U redis /usr/bin/redis-server /etc/redis/redis.conf
   - file:
      path: /etc/service/redis/log/run
      chmod: "+x"

diff --git a/templates/web.template.yml b/templates/web.template.yml
index b20fec9303a4c15b674d4f9ce74916c5ca4f4b07..cc19d92c3e41982537bc121a9c22c7f96d43faaf 100644 (file)
--- a/templates/web.template.yml
+++ b/templates/web.template.yml
@@ -64,7 +64,7 @@ run:
         # postgres
         cd $home
         chown -R discourse:www-data /shared/log/rails
-        LD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
+        LD_PRELOAD=$RUBY_ALLOCATOR HOME=/home/discourse USER=discourse exec thpoff chpst -u discourse:www-data -U discourse:www-data bundle exec config/unicorn_launcher -E production -c config/unicorn.conf.rb
 
   - file:
      path: /etc/service/nginx/run