From 91496e92e3d644a5f739390657de436502ac56a5 Mon Sep 17 00:00:00 2001 From: Felipe Morato Date: Wed, 24 May 2023 13:33:19 +0300 Subject: [PATCH] Upgrade s6-overlay to v3 - socklog replaced by syslogd-overlay - service configuration files moved to a different arrangement --- Dockerfile | 64 +++++++++++-------- docker/rootfs/etc/cont-init.d/01_logs | 4 -- docker/rootfs/etc/keystone/keystone.conf | 3 +- docker/rootfs/etc/rsyslog.conf | 64 ------------------- .../s6-rc.d/keystone/dependencies.d/memcached | 0 .../etc/s6-overlay/s6-rc.d/keystone/run | 4 ++ .../etc/s6-overlay/s6-rc.d/keystone/type | 1 + .../etc/s6-overlay/s6-rc.d/memcached/run | 4 ++ .../etc/s6-overlay/s6-rc.d/memcached/type | 1 + .../swift-main/dependencies.d/keystone | 0 .../swift-main/dependencies.d/memcached | 0 .../etc/s6-overlay/s6-rc.d/swift-main/finish | 4 ++ .../etc/s6-overlay/s6-rc.d/swift-main/run | 4 ++ .../etc/s6-overlay/s6-rc.d/swift-main/type | 1 + .../swift-rest/dependencies.d/keystone | 0 .../swift-rest/dependencies.d/memcached | 0 .../swift-rest/dependencies.d/swift-main | 0 .../etc/s6-overlay/s6-rc.d/swift-rest/finish | 4 ++ .../etc/s6-overlay/s6-rc.d/swift-rest/run | 4 ++ .../etc/s6-overlay/s6-rc.d/swift-rest/type | 1 + .../s6-rc.d/user/contents.d/keystone | 0 .../s6-rc.d/user/contents.d/memcached | 0 .../s6-rc.d/user/contents.d/swift-main | 0 .../s6-rc.d/user/contents.d/swift-rest | 0 docker/rootfs/etc/services.d/keystone/run | 5 -- docker/rootfs/etc/services.d/memcached/run | 3 - docker/rootfs/etc/services.d/swift-main/run | 5 -- docker/rootfs/etc/services.d/swift-rest/run | 5 -- .../etc/socklog.rules/swift_account_server | 3 - docker/rootfs/etc/socklog.rules/swift_all | 7 -- .../etc/socklog.rules/swift_container_server | 3 - .../etc/socklog.rules/swift_object_server | 3 - .../etc/socklog.rules/swift_proxy_server | 3 - docker/rootfs/etc/swift/account-server.conf | 1 - .../etc/swift/container-reconciler.conf | 2 +- docker/rootfs/etc/swift/container-server.conf | 1 - docker/rootfs/etc/swift/object-server.conf | 2 +- docker/rootfs/etc/swift/proxy-server.conf | 4 +- scripts/keystone-swift.http | 2 +- 39 files changed, 70 insertions(+), 142 deletions(-) delete mode 100644 docker/rootfs/etc/cont-init.d/01_logs delete mode 100644 docker/rootfs/etc/rsyslog.conf create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/dependencies.d/memcached create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/run create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/type create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/run create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/type create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/keystone create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/memcached create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/finish create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/run create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/type create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/keystone create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/memcached create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/swift-main create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/finish create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/run create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/type create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/keystone create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/memcached create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-main create mode 100644 docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-rest delete mode 100644 docker/rootfs/etc/services.d/keystone/run delete mode 100644 docker/rootfs/etc/services.d/memcached/run delete mode 100644 docker/rootfs/etc/services.d/swift-main/run delete mode 100644 docker/rootfs/etc/services.d/swift-rest/run delete mode 100644 docker/rootfs/etc/socklog.rules/swift_account_server delete mode 100644 docker/rootfs/etc/socklog.rules/swift_all delete mode 100644 docker/rootfs/etc/socklog.rules/swift_container_server delete mode 100644 docker/rootfs/etc/socklog.rules/swift_object_server delete mode 100644 docker/rootfs/etc/socklog.rules/swift_proxy_server diff --git a/Dockerfile b/Dockerfile index 182c4c0..1dfcc3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,13 +8,12 @@ FROM python:3.9-slim-bullseye as builder -ENV ARCH amd64 -ENV SWIFT_VERSION 2.27.0 -ENV KEYSTONE_VERSION 19.0.1 -ENV KEYSTONEMIDDLEWARE_VERSION 9.2.0 -ENV SWIFTCLIENT_VERSION 3.11.1 -ENV KEYSTONECLIENT_VERSION 4.2.0 -ENV OPENSTACKCLIENT_VERSION 5.5.1 +ENV SWIFT_VERSION=2.27.0 +ENV KEYSTONE_VERSION=19.0.1 +ENV KEYSTONEMIDDLEWARE_VERSION=9.2.0 +ENV SWIFTCLIENT_VERSION=3.11.1 +ENV KEYSTONECLIENT_VERSION=4.2.0 +ENV OPENSTACKCLIENT_VERSION=5.5.1 ENV DEBIAN_FRONTEND=noninteractive @@ -61,10 +60,8 @@ RUN --mount=type=cache,target=/root/.cache/pip \ FROM python:3.9-slim-bullseye -ENV ARCH amd64 -ENV S6_LOGGING 1 -ENV S6_VERSION 2.2.0.3 -ENV SOCKLOG_VERSION 3.1.2-0 +ENV S6_LOGGING=1 +ENV S6_VERSION=3.1.5.0 ENV OS_USERNAME=admin ENV OS_PASSWORD=superuser @@ -75,35 +72,43 @@ ENV OS_AUTH_URL=http://localhost:5000/v3 ENV OS_SWIFT_URL=http://localhost:8080/v1 ENV OS_IDENTITY_API_VERSION=3 +# install system packages +ENV PYTHONUNBUFFERED=1 ENV DEBIAN_FRONTEND=noninteractive -ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-$ARCH.tar.gz /tmp/ -ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-$ARCH.tar.gz.sig /tmp/ -ADD https://github.com/just-containers/socklog-overlay/releases/download/v$SOCKLOG_VERSION/socklog-overlay-$ARCH.tar.gz /tmp/ - - -# Install s6 -RUN tar -C / -xf /tmp/s6-overlay-$ARCH.tar.gz \ - && tar -C / -xf /tmp/socklog-overlay-$ARCH.tar.gz \ - && rm -rf /tmp/s6-overlay* \ - && rm -rf /tmp/socklog-overlay* - RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache RUN --mount=type=cache,target=/var/cache/apt,sharing=private \ --mount=type=cache,target=/var/lib/apt,sharing=private \ apt-get update -q \ && apt-get install -yq --no-install-recommends \ + xz-utils \ liberasurecode1 \ memcached \ - rsyslog \ rsync \ procps \ psmisc \ bash \ && apt-get autoremove -yq --purge -COPY docker/rootfs / +# Install s6 +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-noarch.tar.xz /tmp +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-noarch.tar.xz.sha256 /tmp +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-x86_64.tar.xz /tmp/ +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/s6-overlay-x86_64.tar.xz.sha256 /tmp/ +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/syslogd-overlay-noarch.tar.xz /tmp/ +ADD https://github.com/just-containers/s6-overlay/releases/download/v$S6_VERSION/syslogd-overlay-noarch.tar.xz.sha256 /tmp/ + +RUN cd /tmp \ + && sha256sum -c *.sha256 \ + && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz \ + && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \ + && tar -C / -Jxpf /tmp/syslogd-overlay-noarch.tar.xz \ + && rm -rf /tmp/s6-overlay* \ + && rm -rf /tmp/syslogd* + +# copy files +COPY --chmod=755 docker/rootfs / COPY --from=builder /usr/local/bin /usr/local/bin COPY --from=builder /usr/local/etc /usr/local/etc @@ -113,8 +118,10 @@ COPY --from=builder /usr/local/lib /usr/local/lib # Prepare RUN useradd -U swift \ && useradd -U keystone \ - && mkdir -p "/etc/swift" "/srv/node" "/srv/node/sdb1" "/var/cache/swift" "/var/log/socklog/swift" "/var/log/swift/" "/var/run/swift" "/usr/local/src/" \ - && mkdir -p "/etc/keystone" "/var/log/keystone" "/var/lib/keystone" "/etc/keystone/fernet-keys/" \ + && useradd -U syslog \ + && useradd -U sysllog \ + && mkdir -p "/etc/swift" "/srv/node" "/srv/node/sdb1" "/var/cache/swift" "/var/run/swift" "/usr/local/src/" \ + && mkdir -p "/etc/keystone" "/var/lib/keystone" "/etc/keystone/fernet-keys/" \ # Build swift rings && swift-ring-builder /etc/swift/object.builder create 10 1 1 \ && swift-ring-builder /etc/swift/object.builder add r1z1-127.0.0.1:6200/sdb1 1 \ @@ -125,10 +132,11 @@ RUN useradd -U swift \ && swift-ring-builder /etc/swift/account.builder create 10 1 1 \ && swift-ring-builder /etc/swift/account.builder add r1z1-127.0.0.1:6202/sdb1 1 \ && swift-ring-builder /etc/swift/account.builder rebalance \ - && chown -R swift:swift "/etc/swift" "/srv/node" "/srv/node/sdb1" "/var/cache/swift" "/var/log/socklog/swift" "/var/log/swift/" "/var/run/swift" "/usr/local/src/" \ + && chown -R swift:swift "/etc/swift" "/srv/node" "/srv/node/sdb1" "/var/cache/swift" "/var/run/swift" "/usr/local/src/" \ # Setup Keystone && touch /var/lib/keystone/keystone.db \ - && chown -R keystone:keystone "/etc/keystone" "/var/log/keystone" "/var/lib/keystone" "/etc/keystone/fernet-keys/" \ + && chown -R keystone:keystone "/etc/keystone" "/var/lib/keystone" "/etc/keystone/fernet-keys/" \ + && chmod -R 750 "/etc/keystone" "/var/lib/keystone" "/etc/keystone/fernet-keys/" \ && su -s /bin/sh -c "keystone-manage db_sync" keystone \ && keystone-manage fernet_setup --keystone-user keystone --keystone-group keystone \ && keystone-manage credential_setup --keystone-user keystone --keystone-group keystone \ diff --git a/docker/rootfs/etc/cont-init.d/01_logs b/docker/rootfs/etc/cont-init.d/01_logs deleted file mode 100644 index fcc3e4c..0000000 --- a/docker/rootfs/etc/cont-init.d/01_logs +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -s6-setuidgid swift ln -s /var/log/socklog/swift/swift_all/current /var/log/swift/all.log -s6-setuidgid swift ln -s /var/log/socklog/swift/proxy_server/current /var/log/swift/proxy_access.log diff --git a/docker/rootfs/etc/keystone/keystone.conf b/docker/rootfs/etc/keystone/keystone.conf index 82fe9c8..fa8d63c 100644 --- a/docker/rootfs/etc/keystone/keystone.conf +++ b/docker/rootfs/etc/keystone/keystone.conf @@ -1,5 +1,4 @@ [DEFAULT] -log_dir = /var/log/keystone # # From keystone @@ -608,7 +607,7 @@ connection = sqlite:////var/lib/keystone/keystone.db # # If True, SQLite uses synchronous mode. (boolean value) -#sqlite_synchronous = true +sqlite_synchronous = true # The back end to use for the database. (string value) # Deprecated group/name - [DEFAULT]/db_backend diff --git a/docker/rootfs/etc/rsyslog.conf b/docker/rootfs/etc/rsyslog.conf deleted file mode 100644 index fa42783..0000000 --- a/docker/rootfs/etc/rsyslog.conf +++ /dev/null @@ -1,64 +0,0 @@ -# /etc/rsyslog.conf Configuration file for rsyslog. -# -# For more information see -# /usr/share/doc/rsyslog-doc/html/rsyslog_conf.html -# -# Default logging rules can be found in /etc/rsyslog.d/50-default.conf - - -################# -#### MODULES #### -################# - -$ModLoad imuxsock # provides support for local system logging -#$ModLoad imklog # provides kernel logging support -#$ModLoad immark # provides --MARK-- message capability - -# provides UDP syslog reception -#$ModLoad imudp -#$UDPServerRun 514 - -# provides TCP syslog reception -#$ModLoad imtcp -#$InputTCPServerRun 514 - -# Enable non-kernel facility klog messages -$KLogPermitNonKernelFacility on - -########################### -#### GLOBAL DIRECTIVES #### -########################### - -# -# Use traditional timestamp format. -# To enable high precision timestamps, comment out the following line. -# -$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat - -# Filter duplicated messages -$RepeatedMsgReduction on - -# Disable rate-limiting of log entries -$SystemLogRateLimitInterval 0 -$SystemLogRateLimitBurst 0 - -# -# Set the default permissions for all log files. -# -$FileOwner syslog -$FileGroup adm -$FileCreateMode 0640 -$DirCreateMode 0755 -$Umask 0022 -$PrivDropToUser syslog -$PrivDropToGroup syslog - -# -# Where to place spool and state files -# -$WorkDirectory /var/spool/rsyslog - -# -# Include all config files in /etc/rsyslog.d/ -# -$IncludeConfig /etc/rsyslog.d/*.conf diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/dependencies.d/memcached b/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/dependencies.d/memcached new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/run new file mode 100644 index 0000000..1afddbf --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/run @@ -0,0 +1,4 @@ +#!/command/with-contenv /bin/sh + +exec 2>&1 +exec s6-setuidgid keystone keystone-wsgi-public -b 0.0.0.0 -p 5000 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/type b/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/keystone/type @@ -0,0 +1 @@ +longrun diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/run new file mode 100644 index 0000000..83e90a8 --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/run @@ -0,0 +1,4 @@ +#!/bin/sh + +exec 2>&1 +exec memcached -u root -l 127.0.0.1 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/type b/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/memcached/type @@ -0,0 +1 @@ +longrun diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/keystone b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/keystone new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/memcached b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/dependencies.d/memcached new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/finish b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/finish new file mode 100644 index 0000000..a54a336 --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/finish @@ -0,0 +1,4 @@ +#!/command/with-contenv /bin/sh + +exec 2>&1 +exec s6-setuidgid swift swift-init main kill diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/run new file mode 100644 index 0000000..8d76b0f --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/run @@ -0,0 +1,4 @@ +#!/command/with-contenv /bin/sh + +exec 2>&1 +exec s6-setuidgid swift swift-init main start --no-daemon diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/type b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-main/type @@ -0,0 +1 @@ +longrun diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/keystone b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/keystone new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/memcached b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/memcached new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/swift-main b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/dependencies.d/swift-main new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/finish b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/finish new file mode 100644 index 0000000..770f0c6 --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/finish @@ -0,0 +1,4 @@ +#!/command/with-contenv /bin/sh + +exec 2>&1 +exec s6-setuidgid swift swift-init rest kill diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/run b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/run new file mode 100644 index 0000000..f7164ce --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/run @@ -0,0 +1,4 @@ +#!/command/with-contenv /bin/sh + +exec 2>&1 +exec s6-setuidgid swift swift-init rest start --no-daemon diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/type b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/docker/rootfs/etc/s6-overlay/s6-rc.d/swift-rest/type @@ -0,0 +1 @@ +longrun diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/keystone b/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/keystone new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/memcached b/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/memcached new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-main b/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-main new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-rest b/docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/swift-rest new file mode 100644 index 0000000..e69de29 diff --git a/docker/rootfs/etc/services.d/keystone/run b/docker/rootfs/etc/services.d/keystone/run deleted file mode 100644 index 07fca96..0000000 --- a/docker/rootfs/etc/services.d/keystone/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/execlineb -P - -with-contenv - -exec /usr/local/bin/keystone-wsgi-public -b 0.0.0.0 -p 5000 diff --git a/docker/rootfs/etc/services.d/memcached/run b/docker/rootfs/etc/services.d/memcached/run deleted file mode 100644 index a6d5f99..0000000 --- a/docker/rootfs/etc/services.d/memcached/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/execlineb -P - -memcached -u root -l 127.0.0.1 diff --git a/docker/rootfs/etc/services.d/swift-main/run b/docker/rootfs/etc/services.d/swift-main/run deleted file mode 100644 index f99be5b..0000000 --- a/docker/rootfs/etc/services.d/swift-main/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/execlineb -P - -with-contenv - -exec s6-setuidgid swift /usr/local/bin/swift-init main start --no-daemon diff --git a/docker/rootfs/etc/services.d/swift-rest/run b/docker/rootfs/etc/services.d/swift-rest/run deleted file mode 100644 index 8af888d..0000000 --- a/docker/rootfs/etc/services.d/swift-rest/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/execlineb -P - -with-contenv - -exec s6-setuidgid swift /usr/local/bin/swift-init rest start --no-daemon diff --git a/docker/rootfs/etc/socklog.rules/swift_account_server b/docker/rootfs/etc/socklog.rules/swift_account_server deleted file mode 100644 index 7a8ddb8..0000000 --- a/docker/rootfs/etc/socklog.rules/swift_account_server +++ /dev/null @@ -1,3 +0,0 @@ -- -+\local5.* -/var/log/socklog/swift/account_server diff --git a/docker/rootfs/etc/socklog.rules/swift_all b/docker/rootfs/etc/socklog.rules/swift_all deleted file mode 100644 index 6ce9c89..0000000 --- a/docker/rootfs/etc/socklog.rules/swift_all +++ /dev/null @@ -1,7 +0,0 @@ -- -+\local5.* -+\local4.* -+\local3.* -+\local2.* -+\local0.* -/var/log/socklog/swift/swift_all diff --git a/docker/rootfs/etc/socklog.rules/swift_container_server b/docker/rootfs/etc/socklog.rules/swift_container_server deleted file mode 100644 index 428119e..0000000 --- a/docker/rootfs/etc/socklog.rules/swift_container_server +++ /dev/null @@ -1,3 +0,0 @@ -- -+\local4.* -/var/log/socklog/swift/container_server diff --git a/docker/rootfs/etc/socklog.rules/swift_object_server b/docker/rootfs/etc/socklog.rules/swift_object_server deleted file mode 100644 index e2e92fe..0000000 --- a/docker/rootfs/etc/socklog.rules/swift_object_server +++ /dev/null @@ -1,3 +0,0 @@ -- -+\local3.* -/var/log/socklog/swift/object_server diff --git a/docker/rootfs/etc/socklog.rules/swift_proxy_server b/docker/rootfs/etc/socklog.rules/swift_proxy_server deleted file mode 100644 index b743082..0000000 --- a/docker/rootfs/etc/socklog.rules/swift_proxy_server +++ /dev/null @@ -1,3 +0,0 @@ -- -+\local2.* -/var/log/socklog/swift/proxy_server diff --git a/docker/rootfs/etc/swift/account-server.conf b/docker/rootfs/etc/swift/account-server.conf index ce01eb4..6d429f3 100644 --- a/docker/rootfs/etc/swift/account-server.conf +++ b/docker/rootfs/etc/swift/account-server.conf @@ -3,7 +3,6 @@ devices = /srv/node/ bind_port = 6202 workers = 0 mount_check = false -log_facility = LOG_LOCAL5 log_level = ERROR recon_cache_path = /var/cache/swift eventlet_debug = false diff --git a/docker/rootfs/etc/swift/container-reconciler.conf b/docker/rootfs/etc/swift/container-reconciler.conf index 8d96ca8..defa9c3 100644 --- a/docker/rootfs/etc/swift/container-reconciler.conf +++ b/docker/rootfs/etc/swift/container-reconciler.conf @@ -3,7 +3,7 @@ # user = swift # You can specify default log routing here if you want: # log_name = swift -log_facility = LOG_LOCAL0 +# log_facility = LOG_LOCAL0 log_level = ERROR # log_address = /dev/log # diff --git a/docker/rootfs/etc/swift/container-server.conf b/docker/rootfs/etc/swift/container-server.conf index 3316c22..e70638a 100644 --- a/docker/rootfs/etc/swift/container-server.conf +++ b/docker/rootfs/etc/swift/container-server.conf @@ -4,7 +4,6 @@ bind_port = 6201 workers = 0 mount_check = false disable_fallocate = true -log_facility = LOG_LOCAL4 log_level = ERROR recon_cache_path = /var/cache/swift eventlet_debug = false diff --git a/docker/rootfs/etc/swift/object-server.conf b/docker/rootfs/etc/swift/object-server.conf index 4103bb4..dd3c3a4 100644 --- a/docker/rootfs/etc/swift/object-server.conf +++ b/docker/rootfs/etc/swift/object-server.conf @@ -4,7 +4,7 @@ bind_port = 6200 workers = 0 mount_check = false disable_fallocate = true -log_facility = LOG_LOCAL3 +# log_facility = LOG_LOCAL3 log_level = ERROR eventlet_debug = false diff --git a/docker/rootfs/etc/swift/proxy-server.conf b/docker/rootfs/etc/swift/proxy-server.conf index 3ffeffc..88e60a4 100644 --- a/docker/rootfs/etc/swift/proxy-server.conf +++ b/docker/rootfs/etc/swift/proxy-server.conf @@ -2,8 +2,8 @@ bind_ip = 0.0.0.0 bind_port = 8080 workers = 0 -log_address = /dev/log -log_facility = LOG_LOCAL2 +# log_address = /dev/log +# log_facility = LOG_LOCAL2 log_headers = false log_level = ERROR log_name = proxy-server diff --git a/scripts/keystone-swift.http b/scripts/keystone-swift.http index 1866838..10d8da3 100644 --- a/scripts/keystone-swift.http +++ b/scripts/keystone-swift.http @@ -148,7 +148,7 @@ HEAD {{tmpStorageURL}} X-Auth-Token: {{tmpToken}} ### Read container meta -GET {{tmpStorageURL}}/bucket-001 +GET {{tmpStorageURL}}/test-cont X-Auth-Token: {{tmpToken}} ### Create container