Prepare for LXC3

This commit is contained in:
Disassembler 2018-09-07 14:37:38 +02:00
parent 6ca49d4865
commit de640bb005
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 8 additions and 4 deletions

View File

@ -4,7 +4,7 @@ set -e
SOURCE_DIR=$(realpath $(dirname "${0}"))/basic SOURCE_DIR=$(realpath $(dirname "${0}"))/basic
# Install packages # 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 if [ ${DEBUG:-0} -eq 1 ]; then
# Install some utilities for DEBUG mode # Install some utilities for DEBUG mode
apk --no-cache add git file htop less openssh-server openssh-sftp-server 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 cp ${SOURCE_DIR}/etc/nginx/nginx.conf /etc/nginx/nginx.conf
# Configure services # 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 rc-update add ${SERVICE} boot
service ${SERVICE} start service ${SERVICE} start
done done

View File

@ -32,10 +32,14 @@ lxc.init.gid = {gid}
# Halt # Halt
lxc.signal.halt = SIGTERM lxc.signal.halt = SIGTERM
# Log
lxc.console.size = 1MB
lxc.console.logfile = /var/log/lxc/{name}.log
# Other # Other
lxc.arch = x86_64 lxc.arch = x86_64
lxc.cap.drop = sys_admin lxc.cap.drop = sys_admin
lxc.include = /usr/share/lxc/config/alpine.common.conf lxc.include = /usr/share/lxc/config/common.conf
''' '''
class LXCImage: class LXCImage:

View File

@ -63,7 +63,7 @@ listen_addresses = '*' # what IP address(es) to listen on;
#port = 5432 # (change requires restart) #port = 5432 # (change requires restart)
max_connections = 100 # (change requires restart) max_connections = 100 # (change requires restart)
#superuser_reserved_connections = 3 # (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) # (change requires restart)
#unix_socket_group = '' # (change requires restart) #unix_socket_group = '' # (change requires restart)
#unix_socket_permissions = 0777 # begin with 0 to use octal notation #unix_socket_permissions = 0777 # begin with 0 to use octal notation