Mercurial > repos > other > Puppet

changeset 120:b00eb9434938 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable PCRE JIT to stop SELinux giving "denied execmem" for Apache This probably hits performance slightly, but at least now we'll be able to see what happens in audit.log and it won't roll over every few hours!
author IBBoard <dev@ibboard.co.uk>
date Sat, 13 Aug 2016 13:44:01 +0100
parents 95502bafeaa3
children 6709f2052217
files modules/website/files/custom-php.ini modules/website/manifests/php.pp
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/modules/website/files/custom-php.ini	Sat Aug 13 13:44:01 2016 +0100
@@ -0,0 +1,5 @@
+; Use UTF-8. Because why not?
+default_charset = 'UTF-8'
+
+; Work around SELinux "denied execmem" warnings from preg_match JITing
+pcre.jit = 0
--- a/modules/website/manifests/php.pp	Wed Jul 20 20:31:22 2016 +0100
+++ b/modules/website/manifests/php.pp	Sat Aug 13 13:44:01 2016 +0100
@@ -31,7 +31,7 @@
   }
   file { '/etc/php.d/custom-php.ini':
     ensure => present,
-    content => 'default_charset = \'UTF-8\'',
+    source => 'puppet:///modules/website/custom-php.ini',
   }
 
   if $opcache {