This repository has been archived by the owner on Jun 21, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 18
nginx: Add reverse http(s) proxy for users #155
Open
mayli
wants to merge
6
commits into
hashbang:master
Choose a base branch
from
mayli:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1938cbf
nginx: add and pin nginx from nginx.org
mayli 7dc3246
committing changes in /etc after apt run
mayli 13d0985
nginx: add config files for uds reverse proxy
mayli 22d1f6e
PAM: Create symlinks needed by nginx
KellerFuchs 3848c20
nginx/symlinks: Fixup (do not create links for system users)
KellerFuchs d161481
Merge branch 'master' into master
mayli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# > v1.11.5 (jessie) is required for ngx_stream_ssl_preread_module | ||
Package: nginx | ||
Pin: origin nginx.org | ||
Pin-Priority: 990 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
deb http://nginx.org/packages/debian/ jessie nginx | ||
deb-src http://nginx.org/packages/debian/ jessie nginx |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# Defaults for nginx initscript | ||
# sourced by /etc/init.d/nginx | ||
|
||
# Additional options that are passed to nginx | ||
DAEMON_ARGS="" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# Defaults for nginx initscript | ||
# sourced by /etc/init.d/nginx-debug | ||
NAME="nginx-debug" | ||
DESC="nginx-debug" | ||
DAEMON="/usr/sbin/nginx-debug" | ||
|
||
# Additional options that are passed to nginx | ||
DAEMON_OPTS="" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -64,3 +64,4 @@ kvm:x:124: | |
unbound:x:125: | ||
debian-tor:x:127: | ||
ntpd:x:126: | ||
nginx:x:128: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
#!/bin/sh | ||
### BEGIN INIT INFO | ||
# Provides: nginx | ||
# Required-Start: $network $remote_fs $local_fs | ||
# Required-Stop: $network $remote_fs $local_fs | ||
# Default-Start: 2 3 4 5 | ||
# Default-Stop: 0 1 6 | ||
# Short-Description: Stop/start nginx | ||
### END INIT INFO | ||
|
||
# Author: Sergey Budnevitch <[email protected]> | ||
|
||
PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
|
||
if [ -L $0 ]; then | ||
SCRIPTNAME=`/bin/readlink -f $0` | ||
else | ||
SCRIPTNAME=$0 | ||
fi | ||
|
||
sysconfig=`/usr/bin/basename $SCRIPTNAME` | ||
|
||
[ -r /etc/default/$sysconfig ] && . /etc/default/$sysconfig | ||
|
||
DESC=${DESC:-nginx} | ||
NAME=${NAME:-nginx} | ||
CONFFILE=${CONFFILE:-/etc/nginx/nginx.conf} | ||
DAEMON=${DAEMON:-/usr/sbin/nginx} | ||
PIDFILE=${PIDFILE:-/var/run/nginx.pid} | ||
SLEEPSEC=${SLEEPSEC:-1} | ||
UPGRADEWAITLOOPS=${UPGRADEWAITLOOPS:-5} | ||
CHECKSLEEP=${CHECKSLEEP:-3} | ||
|
||
[ -x $DAEMON ] || exit 0 | ||
|
||
DAEMON_ARGS="-c $CONFFILE $DAEMON_ARGS" | ||
|
||
. /lib/init/vars.sh | ||
|
||
. /lib/lsb/init-functions | ||
|
||
do_start() | ||
{ | ||
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ | ||
$DAEMON_ARGS | ||
RETVAL="$?" | ||
return "$RETVAL" | ||
} | ||
|
||
do_stop() | ||
{ | ||
# Return | ||
# 0 if daemon has been stopped | ||
# 1 if daemon was already stopped | ||
# 2 if daemon could not be stopped | ||
# other if a failure occurred | ||
start-stop-daemon --stop --quiet --oknodo --retry=TERM/30/KILL/5 --pidfile $PIDFILE | ||
RETVAL="$?" | ||
rm -f $PIDFILE | ||
return "$RETVAL" | ||
} | ||
|
||
do_reload() { | ||
# | ||
start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE | ||
RETVAL="$?" | ||
return "$RETVAL" | ||
} | ||
|
||
do_configtest() { | ||
if [ "$#" -ne 0 ]; then | ||
case "$1" in | ||
-q) | ||
FLAG=$1 | ||
;; | ||
*) | ||
;; | ||
esac | ||
shift | ||
fi | ||
$DAEMON -t $FLAG -c $CONFFILE | ||
RETVAL="$?" | ||
return $RETVAL | ||
} | ||
|
||
do_upgrade() { | ||
OLDBINPIDFILE=$PIDFILE.oldbin | ||
|
||
do_configtest -q || return 6 | ||
start-stop-daemon --stop --signal USR2 --quiet --pidfile $PIDFILE | ||
RETVAL="$?" | ||
|
||
for i in `/usr/bin/seq $UPGRADEWAITLOOPS`; do | ||
sleep $SLEEPSEC | ||
if [ -f $OLDBINPIDFILE -a -f $PIDFILE ]; then | ||
start-stop-daemon --stop --signal QUIT --quiet --pidfile $OLDBINPIDFILE | ||
RETVAL="$?" | ||
return | ||
fi | ||
done | ||
|
||
echo $"Upgrade failed!" | ||
RETVAL=1 | ||
return $RETVAL | ||
} | ||
|
||
do_checkreload() { | ||
templog=`/bin/mktemp --tmpdir nginx-check-reload-XXXXXX.log` | ||
trap '/bin/rm -f $templog' 0 | ||
/usr/bin/tail --pid=$$ -n 0 --follow=name /var/log/nginx/error.log > $templog & | ||
/bin/sleep 1 | ||
start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE | ||
/bin/sleep $CHECKSLEEP | ||
/bin/grep -E "\[emerg\]|\[alert\]" $templog | ||
} | ||
|
||
case "$1" in | ||
start) | ||
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" | ||
do_start | ||
case "$?" in | ||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; | ||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; | ||
esac | ||
;; | ||
stop) | ||
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" | ||
do_stop | ||
case "$?" in | ||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; | ||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; | ||
esac | ||
;; | ||
status) | ||
status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $? | ||
;; | ||
configtest) | ||
do_configtest | ||
;; | ||
upgrade) | ||
do_upgrade | ||
;; | ||
reload|force-reload) | ||
log_daemon_msg "Reloading $DESC" "$NAME" | ||
do_reload | ||
log_end_msg $? | ||
;; | ||
restart|force-reload) | ||
log_daemon_msg "Restarting $DESC" "$NAME" | ||
do_configtest -q || exit $RETVAL | ||
do_stop | ||
case "$?" in | ||
0|1) | ||
do_start | ||
case "$?" in | ||
0) log_end_msg 0 ;; | ||
1) log_end_msg 1 ;; # Old process is still running | ||
*) log_end_msg 1 ;; # Failed to start | ||
esac | ||
;; | ||
*) | ||
# Failed to stop | ||
log_end_msg 1 | ||
;; | ||
esac | ||
;; | ||
check-reload) | ||
do_checkreload | ||
RETVAL=0 | ||
;; | ||
*) | ||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload|upgrade|configtest|check-reload}" >&2 | ||
exit 3 | ||
;; | ||
esac | ||
|
||
exit $RETVAL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
#!/bin/sh | ||
### BEGIN INIT INFO | ||
# Provides: nginx-debug | ||
# Required-Start: $network $remote_fs $local_fs | ||
# Required-Stop: $network $remote_fs $local_fs | ||
# Default-Start: | ||
# Default-Stop: 0 1 2 3 4 5 6 | ||
# Short-Description: Stop/start nginx | ||
### END INIT INFO | ||
|
||
# Author: Sergey Budnevitch <[email protected]> | ||
|
||
PATH=/sbin:/usr/sbin:/bin:/usr/bin | ||
|
||
if [ -L $0 ]; then | ||
SCRIPTNAME=`/bin/readlink -f $0` | ||
else | ||
SCRIPTNAME=$0 | ||
fi | ||
|
||
sysconfig=`/usr/bin/basename $SCRIPTNAME` | ||
|
||
[ -r /etc/default/$sysconfig ] && . /etc/default/$sysconfig | ||
|
||
DESC=${DESC:-nginx-debug} | ||
NAME=${NAME:-nginx-debug} | ||
CONFFILE=${CONFFILE:-/etc/nginx/nginx.conf} | ||
DAEMON=${DAEMON:-/usr/sbin/nginx-debug} | ||
PIDFILE=${PIDFILE:-/var/run/nginx.pid} | ||
SLEEPSEC=${SLEEPSEC:-1} | ||
UPGRADEWAITLOOPS=${UPGRADEWAITLOOPS:-5} | ||
CHECKSLEEP=${CHECKSLEEP:-3} | ||
|
||
[ -x $DAEMON ] || exit 0 | ||
|
||
DAEMON_ARGS="-c $CONFFILE $DAEMON_ARGS" | ||
|
||
. /lib/init/vars.sh | ||
|
||
. /lib/lsb/init-functions | ||
|
||
do_start() | ||
{ | ||
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ | ||
$DAEMON_ARGS | ||
RETVAL="$?" | ||
return "$RETVAL" | ||
} | ||
|
||
do_stop() | ||
{ | ||
# Return | ||
# 0 if daemon has been stopped | ||
# 1 if daemon was already stopped | ||
# 2 if daemon could not be stopped | ||
# other if a failure occurred | ||
start-stop-daemon --stop --quiet --oknodo --retry=TERM/30/KILL/5 --pidfile $PIDFILE | ||
RETVAL="$?" | ||
rm -f $PIDFILE | ||
return "$RETVAL" | ||
} | ||
|
||
do_reload() { | ||
# | ||
start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE | ||
RETVAL="$?" | ||
return "$RETVAL" | ||
} | ||
|
||
do_configtest() { | ||
if [ "$#" -ne 0 ]; then | ||
case "$1" in | ||
-q) | ||
FLAG=$1 | ||
;; | ||
*) | ||
;; | ||
esac | ||
shift | ||
fi | ||
$DAEMON -t $FLAG -c $CONFFILE | ||
RETVAL="$?" | ||
return $RETVAL | ||
} | ||
|
||
do_upgrade() { | ||
OLDBINPIDFILE=$PIDFILE.oldbin | ||
|
||
do_configtest -q || return 6 | ||
start-stop-daemon --stop --signal USR2 --quiet --pidfile $PIDFILE | ||
RETVAL="$?" | ||
|
||
for i in `/usr/bin/seq $UPGRADEWAITLOOPS`; do | ||
sleep $SLEEPSEC | ||
if [ -f $OLDBINPIDFILE -a -f $PIDFILE ]; then | ||
start-stop-daemon --stop --signal QUIT --quiet --pidfile $OLDBINPIDFILE | ||
RETVAL="$?" | ||
return | ||
fi | ||
done | ||
|
||
echo $"Upgrade failed!" | ||
RETVAL=1 | ||
return $RETVAL | ||
} | ||
|
||
do_checkreload() { | ||
templog=`/bin/mktemp --tmpdir nginx-check-reload-XXXXXX.log` | ||
trap '/bin/rm -f $templog' 0 | ||
/usr/bin/tail --pid=$$ -n 0 --follow=name /var/log/nginx/error.log > $templog & | ||
/bin/sleep 1 | ||
start-stop-daemon --stop --signal HUP --quiet --pidfile $PIDFILE | ||
/bin/sleep $CHECKSLEEP | ||
/bin/grep -E "\[emerg\]|\[alert\]" $templog | ||
} | ||
|
||
case "$1" in | ||
start) | ||
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" | ||
do_start | ||
case "$?" in | ||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; | ||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; | ||
esac | ||
;; | ||
stop) | ||
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" | ||
do_stop | ||
case "$?" in | ||
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; | ||
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; | ||
esac | ||
;; | ||
status) | ||
status_of_proc -p "$PIDFILE" "$DAEMON" "$NAME" && exit 0 || exit $? | ||
;; | ||
configtest) | ||
do_configtest | ||
;; | ||
upgrade) | ||
do_upgrade | ||
;; | ||
reload|force-reload) | ||
log_daemon_msg "Reloading $DESC" "$NAME" | ||
do_reload | ||
log_end_msg $? | ||
;; | ||
restart|force-reload) | ||
log_daemon_msg "Restarting $DESC" "$NAME" | ||
do_configtest -q || exit $RETVAL | ||
do_stop | ||
case "$?" in | ||
0|1) | ||
do_start | ||
case "$?" in | ||
0) log_end_msg 0 ;; | ||
1) log_end_msg 1 ;; # Old process is still running | ||
*) log_end_msg 1 ;; # Failed to start | ||
esac | ||
;; | ||
*) | ||
# Failed to stop | ||
log_end_msg 1 | ||
;; | ||
esac | ||
;; | ||
check-reload) | ||
do_checkreload | ||
RETVAL=0 | ||
;; | ||
*) | ||
echo "Usage: $SCRIPTNAME {start|stop|status|restart|reload|force-reload|upgrade|configtest|check-reload}" >&2 | ||
exit 3 | ||
;; | ||
esac | ||
|
||
exit $RETVAL |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/var/log/nginx/*.log { | ||
daily | ||
missingok | ||
rotate 52 | ||
compress | ||
delaycompress | ||
notifempty | ||
create 640 nginx adm | ||
sharedscripts | ||
postrotate | ||
if [ -f /var/run/nginx.pid ]; then | ||
kill -USR1 `cat /var/run/nginx.pid` | ||
fi | ||
endscript | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we really need 52 days of logs?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will (probably) be the default in debian: I doubt this was selected by @mayli
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that's default from debian
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I understand it's the default, but I'm still asking the question- do we as hashbang need that many days?