Compare commits

..

No commits in common. "3c14447ef9a26544e3764aa329c376ae0488c1f7" and "ac2839339894dab3ddfe6de1419e1710ffafcd15" have entirely different histories.

4 changed files with 5 additions and 70 deletions

View File

@ -1,40 +0,0 @@
#!/bin/sh
set -e
. /usr/share/debconf/confmodule
case "$1" in
configure)
# Create numerus user and group
if ! getent group numerus >/dev/null; then
addgroup --system --quiet numerus
fi
if ! getent passwd numerus >/dev/null; then
adduser --quiet \
--system \
--disabled-login \
--no-create-home \
--shell /bin/bash \
--ingroup numerus \
--home /usr/share/numerus \
--gecos "Numerus Daemon" \
numerus
fi
# Make sure log directory has correct permissions set
dpkg-statoverride --list "/var/log/numerus" >/dev/null || \
dpkg-statoverride --add --force --quiet --update numerus adm 0750 /var/log/numerus
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
#DEBHELPER#
exit 0

View File

@ -1,15 +0,0 @@
[Unit]
Description=Numerus application server
Requires=postgresql.service
After=postgresql.service
[Service]
Type=simple
User=numerus
Group=numerus
WorkingDirectory=/usr/share/numerus
EnvironmentFile=-/etc/default/numerus
ExecStart=/usr/bin/numerus
Restart=always
StandardOutput=append:/var/log/numerus/access.log
StandardError=append:/var/log/numerus/error.log

View File

@ -44,7 +44,7 @@ func Logger(handler http.Handler) http.Handler {
referer = "-" referer = "-"
} }
log.Printf("HTTP - %s - - [%s] \"%s %s %s\" %d %d \"%s\" \"%s\" %s\n", log.Printf("HTTP - %s - - [%s] \"%s %s %s\" %d %d \"%s\" \"%s\" %s\n",
remoteAddr(r), r.RemoteAddr,
t.Format("02/Jan/2006:15:04:05 -0700"), t.Format("02/Jan/2006:15:04:05 -0700"),
r.Method, r.Method,
r.URL.Path, r.URL.Path,

View File

@ -7,7 +7,6 @@ import (
"html/template" "html/template"
"net" "net"
"net/http" "net/http"
"strings"
"time" "time"
"golang.org/x/text/language" "golang.org/x/text/language"
@ -130,20 +129,11 @@ func HandleLogout(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
} }
func remoteAddr(r *http.Request) string { func remoteAddr(r *http.Request) string {
address, _, _ := net.SplitHostPort(r.RemoteAddr) address := r.Header.Get("X-Forwarded-For")
if address != "localhost" && address != "127.0.0.1" && address != "::1" { if address == "" {
return address address, _, _ = net.SplitHostPort(r.RemoteAddr)
} }
forwarded := r.Header.Get("X-Forwarded-For")
if forwarded == "" {
return address return address
}
ips := strings.Split(forwarded, ", ")
forwarded = ips[0]
if forwarded == "" {
return address
}
return forwarded
} }
func setSessionCookie(w http.ResponseWriter, cookie string) { func setSessionCookie(w http.ResponseWriter, cookie string) {