From dbacf11bd306badd939af7127f625e2cb9523eec Mon Sep 17 00:00:00 2001 From: Drone CI Date: Tue, 29 Jan 2019 20:29:12 +0100 Subject: [PATCH] [WIP][CI SKIP] nginx real_ip --- Dockerfile | 3 ++- nginx/nginx.conf | 4 +++- nginx/realip.conf | 2 ++ scripts/seafile-server.sh | 2 +- scripts/start-ngix.sh | 7 +++++++ 5 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 nginx/realip.conf create mode 100644 scripts/start-ngix.sh diff --git a/Dockerfile b/Dockerfile index 2bf2662..b479093 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,11 @@ COPY conf /opt/seafile/conf COPY conf /etc/seafile COPY nginx /etc/nginx COPY scripts/upgrade.py /usr/local/sbin/upgrade +COPY scripts/start-nginx.sh /usr/bin/start-nginx COPY scripts/seafile-server.sh /sbin/seafile-server RUN ulimit -n 30000 && mkdir -p $SEAF/pids && \ - chmod +x /usr/local/sbin/upgrade /sbin/seafile-server + chmod +x /usr/local/sbin/upgrade /sbin/seafile-server /usr/bin/start-nginx ENV SEAF_UPGRADE_INTERVAL=3 diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 01e9a40..8ce928d 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -15,7 +15,9 @@ http { error_log /dev/stderr; include seafile/*.conf; - + + include realip.conf; + include extra.conf; } diff --git a/nginx/realip.conf b/nginx/realip.conf new file mode 100644 index 0000000..5c251c8 --- /dev/null +++ b/nginx/realip.conf @@ -0,0 +1,2 @@ +real_ip_header X-Forwarded-For; +set_real_ip_from 127.0.0.1; diff --git a/scripts/seafile-server.sh b/scripts/seafile-server.sh index c9bbc3c..6a821bf 100755 --- a/scripts/seafile-server.sh +++ b/scripts/seafile-server.sh @@ -3,7 +3,7 @@ LATEST=$SEAF/seafile-server-latest PIDS=$SEAF/pids PIDFILES=("$PIDS" "$LATEST/runtime" "/var/run/nginx") -COMMANDS=("seaf-server $LATEST/seafile.sh start" "seahub $LATEST/seahub.sh ${SEAF_HUB_MODE:-start} 8000" "nginx /usr/sbin/nginx") +COMMANDS=("seaf-server $LATEST/seafile.sh start" "seahub $LATEST/seahub.sh ${SEAF_HUB_MODE:-start} 8000" "nginx /usr/bin/start-nginx") function stop { #Kill when hitting CTRL+C repeatedly diff --git a/scripts/start-ngix.sh b/scripts/start-ngix.sh new file mode 100644 index 0000000..be42d48 --- /dev/null +++ b/scripts/start-ngix.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +echo "$SEAF_FRONTEND" | IFS=';' while read IP; do + echo "set_real_ip_from $IP;" >> /etc/nginx/realip.conf +done +#This script is only supposed to run once +rm -f $0 && ln -s /usr/sbin/nginx $0 && /usr/sbin/nginx