From 3eea156521f93165701b3960e022675ea3f20ce3 Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 10 2020 17:04:03 +0000
Subject: Merge branch 'cboltz-follow-lrupp' into 'production'


Wiki: give memcached more memory and security

See merge request infra/salt!360
---

diff --git a/salt/profile/wiki/files/memcached.apparmor b/salt/profile/wiki/files/memcached.apparmor
index 3e273f8..e7b5ba8 100644
--- a/salt/profile/wiki/files/memcached.apparmor
+++ b/salt/profile/wiki/files/memcached.apparmor
@@ -14,7 +14,7 @@
 
 #include <tunables/global>
 
-profile memcached /usr/sbin/memcached flags=(complain) {
+profile memcached /usr/sbin/memcached {
   #include <abstractions/base>
   #include <abstractions/nameservice>
 
diff --git a/salt/profile/wiki/memcached.sls b/salt/profile/wiki/memcached.sls
index 072d43a..b77b5a5 100644
--- a/salt/profile/wiki/memcached.sls
+++ b/salt/profile/wiki/memcached.sls
@@ -9,6 +9,6 @@ memcached:
 /etc/sysconfig/memcached:
   file.replace:
     - pattern: ^MEMCACHED_PARAMS=.*$
-    - repl: MEMCACHED_PARAMS="-l 127.0.0.1 -m 2048"
+    - repl: MEMCACHED_PARAMS="-l 127.0.0.1 -m 4096"
     - listen_in:
       - service: memcached