From de640bb0050868e732825eb7e86ba13964dbeacf Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 7 Sep 2018 14:37:38 +0200
Subject: [PATCH] Prepare for LXC3

---
 basic.sh                                         | 4 ++--
 lxc-build                                        | 6 +++++-
 postgres/setup/srv/postgres/data/postgresql.conf | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/basic.sh b/basic.sh
index b8257a0..935ae38 100755
--- a/basic.sh
+++ b/basic.sh
@@ -4,7 +4,7 @@ set -e
 SOURCE_DIR=$(realpath $(dirname "${0}"))/basic
 
 # Install packages
-apk --no-cache add curl bridge e2fsprogs-extra gettext iptables kbd-misc libressl lxc python3 py3-bcrypt py3-cffi py3-dnspython py3-jinja2 py3-requests py3-six py3-werkzeug nginx util-linux
+apk --no-cache add curl bridge e2fsprogs-extra gettext iptables kbd-misc libressl python3 py3-bcrypt py3-cffi py3-dnspython py3-jinja2 py3-requests py3-six py3-werkzeug nginx util-linux
 if [ ${DEBUG:-0} -eq 1 ]; then
     # Install some utilities for DEBUG mode
     apk --no-cache add git file htop less openssh-server openssh-sftp-server
@@ -60,7 +60,7 @@ vmmgr create-selfsigned
 cp ${SOURCE_DIR}/etc/nginx/nginx.conf /etc/nginx/nginx.conf
 
 # Configure services
-for SERVICE in consolefont crond iptables nginx ntpd lxc swap vmmgr; do
+for SERVICE in consolefont crond iptables nginx ntpd swap vmmgr; do
     rc-update add ${SERVICE} boot
     service ${SERVICE} start
 done
diff --git a/lxc-build b/lxc-build
index 4190d2a..263ac6b 100755
--- a/lxc-build
+++ b/lxc-build
@@ -32,10 +32,14 @@ lxc.init.gid = {gid}
 # Halt
 lxc.signal.halt = SIGTERM
 
+# Log
+lxc.console.size = 1MB
+lxc.console.logfile = /var/log/lxc/{name}.log
+
 # Other
 lxc.arch = x86_64
 lxc.cap.drop = sys_admin
-lxc.include = /usr/share/lxc/config/alpine.common.conf
+lxc.include = /usr/share/lxc/config/common.conf
 '''
 
 class LXCImage:
diff --git a/postgres/setup/srv/postgres/data/postgresql.conf b/postgres/setup/srv/postgres/data/postgresql.conf
index fd0d697..bec8b6b 100644
--- a/postgres/setup/srv/postgres/data/postgresql.conf
+++ b/postgres/setup/srv/postgres/data/postgresql.conf
@@ -63,7 +63,7 @@ listen_addresses = '*'			# what IP address(es) to listen on;
 #port = 5432				# (change requires restart)
 max_connections = 100			# (change requires restart)
 #superuser_reserved_connections = 3	# (change requires restart)
-unix_socket_directories = '/run/postgresql'	# comma-separated list of directories
+unix_socket_directories = '/run/postgresql,/tmp'	# comma-separated list of directories
 					# (change requires restart)
 #unix_socket_group = ''			# (change requires restart)
 #unix_socket_permissions = 0777		# begin with 0 to use octal notation