From 1482bd8fb4d03f07db0d1a7f60d752357140a91f Mon Sep 17 00:00:00 2001 From: jack Date: Mon, 12 May 2014 13:20:13 +0800 Subject: [PATCH 1/4] add supervisor support and script, easy to use. just like ./gogs_supervisord.sh start ./gogs_supervisord.sh stop ./gogs_supervisord.sh restart and logs all saved tmp folder --- etc/supervisord.conf | 26 ++++++++++++++++++++++++++ gogs_supervisord.sh | 35 +++++++++++++++++++++++++++++++++++ tmp/readme.txt | 1 + 3 files changed, 62 insertions(+) create mode 100644 etc/supervisord.conf create mode 100644 gogs_supervisord.sh create mode 100644 tmp/readme.txt diff --git a/etc/supervisord.conf b/etc/supervisord.conf new file mode 100644 index 000000000..e273af327 --- /dev/null +++ b/etc/supervisord.conf @@ -0,0 +1,26 @@ +[unix_http_server] +file=/tmp/supervisor.sock ; path to your socket file + +[supervisord] +logfile=tmp/supervisord.log ; supervisord log file +logfile_maxbytes=50MB ; maximum size of logfile before rotation +logfile_backups=10 ; number of backed up logfiles +loglevel=warn ; info, debug, warn, trace +pidfile=tmp/supervisord.pid ; pidfile location +nodaemon=false ; run supervisord as a daemon +minfds=1024 ; number of startup file descriptors +minprocs=200 ; number of process descriptors +user=root ; default user +childlogdir=tmp + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket + +[program:gogs] +command = /root/Developer/gopath/src/github.com/gogits/gogs/start.sh ; here must be the real url, not ~ or $GOROOT like +autostart = true +stdout_logfile = tmp/gogs-stderr.log +stderr_logfile = tmp/gogs-error.log \ No newline at end of file diff --git a/gogs_supervisord.sh b/gogs_supervisord.sh new file mode 100644 index 000000000..fb8b9b53a --- /dev/null +++ b/gogs_supervisord.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +PID="tmp/supervisord.pid" +CONF="etc/supervisord.conf" + +stop() { + if [ -f $PID ]; then + kill `cat -- $PID` + rm -f -- $PID + echo "stopped" + fi +} + +start() { + echo "starting" + if [ ! -f $PID ]; then + supervisord -c $CONF + echo "started" + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" +esac \ No newline at end of file diff --git a/tmp/readme.txt b/tmp/readme.txt new file mode 100644 index 000000000..21984192e --- /dev/null +++ b/tmp/readme.txt @@ -0,0 +1 @@ +here is log for supervisord and gogs \ No newline at end of file From 7ec3f1b2d88c9f8f92c6377ec71fcd018ae80d9e Mon Sep 17 00:00:00 2001 From: jack Date: Mon, 12 May 2014 21:13:05 +0800 Subject: [PATCH 2/4] modify the file path move etc/supervisord.conf to conf/etc/supervisord; remove tmp folder, then all logs move to log folder; move the supervisor.pid to /tmp folder. --- {etc => conf/etc}/supervisord.conf | 12 ++++++------ gogs_supervisord.sh | 4 ++-- tmp/readme.txt | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) rename {etc => conf/etc}/supervisord.conf (76%) delete mode 100644 tmp/readme.txt diff --git a/etc/supervisord.conf b/conf/etc/supervisord.conf similarity index 76% rename from etc/supervisord.conf rename to conf/etc/supervisord.conf index e273af327..e17f50a84 100644 --- a/etc/supervisord.conf +++ b/conf/etc/supervisord.conf @@ -2,16 +2,16 @@ file=/tmp/supervisor.sock ; path to your socket file [supervisord] -logfile=tmp/supervisord.log ; supervisord log file +logfile=log/supervisord.log ; supervisord log file logfile_maxbytes=50MB ; maximum size of logfile before rotation logfile_backups=10 ; number of backed up logfiles loglevel=warn ; info, debug, warn, trace -pidfile=tmp/supervisord.pid ; pidfile location +pidfile=/tmp/supervisord.pid ; pidfile location nodaemon=false ; run supervisord as a daemon minfds=1024 ; number of startup file descriptors minprocs=200 ; number of process descriptors user=root ; default user -childlogdir=tmp +childlogdir=log [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface @@ -20,7 +20,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket [program:gogs] -command = /root/Developer/gopath/src/github.com/gogits/gogs/start.sh ; here must be the real url, not ~ or $GOROOT like +command = /root/Developer/gopath/src/github.com/gogits/gogs/start.sh ; here must be the real url, not ~ or $GOROOT like autostart = true -stdout_logfile = tmp/gogs-stderr.log -stderr_logfile = tmp/gogs-error.log \ No newline at end of file +stdout_logfile = log/supervisor-gogs-stderr.log +stderr_logfile = log/supervisor-gogs-error.log \ No newline at end of file diff --git a/gogs_supervisord.sh b/gogs_supervisord.sh index fb8b9b53a..2c7c6539b 100644 --- a/gogs_supervisord.sh +++ b/gogs_supervisord.sh @@ -1,7 +1,7 @@ #!/bin/sh -PID="tmp/supervisord.pid" -CONF="etc/supervisord.conf" +PID="/tmp/supervisord.pid" +CONF="conf/etc/supervisord.conf" stop() { if [ -f $PID ]; then diff --git a/tmp/readme.txt b/tmp/readme.txt deleted file mode 100644 index 21984192e..000000000 --- a/tmp/readme.txt +++ /dev/null @@ -1 +0,0 @@ -here is log for supervisord and gogs \ No newline at end of file From 83a10ce880f3eb15c7f6736aecece3ea41d9c3cd Mon Sep 17 00:00:00 2001 From: jack Date: Mon, 12 May 2014 21:50:04 +0800 Subject: [PATCH 3/4] add tip to modify the command path, add check the log folder, if not then create it. --- gogs_supervisord.sh | 7 +++++++ 1 file changed, 7 insertions(+) mode change 100644 => 100755 gogs_supervisord.sh diff --git a/gogs_supervisord.sh b/gogs_supervisord.sh old mode 100644 new mode 100755 index 2c7c6539b..43908094b --- a/gogs_supervisord.sh +++ b/gogs_supervisord.sh @@ -1,8 +1,15 @@ #!/bin/sh +echo 'plase remember to modify the command path in etc/conf/supervisord.conf(line 23)' + PID="/tmp/supervisord.pid" CONF="conf/etc/supervisord.conf" +LOGDIR="log" +if [ ! -d $LOGDIR ]; then + mkdir $LOGDIR +fi + stop() { if [ -f $PID ]; then kill `cat -- $PID` From eb264a112b378d1ebdf8e1de076797dd56a0e6b8 Mon Sep 17 00:00:00 2001 From: Sebastian Jackel Date: Thu, 15 May 2014 14:21:27 +0200 Subject: [PATCH 4/4] Add LDAP over SSL support --- modules/auth/authentication.go | 2 ++ modules/auth/ldap/ldap.go | 16 +++++++++++++--- modules/base/conf.go | 3 ++- routers/admin/auths.go | 2 ++ templates/admin/auths/edit.tmpl | 10 +++++++++- templates/admin/auths/new.tmpl | 9 ++++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/modules/auth/authentication.go b/modules/auth/authentication.go index 4456d2a5f..74d5e11b6 100644 --- a/modules/auth/authentication.go +++ b/modules/auth/authentication.go @@ -21,6 +21,7 @@ type AuthenticationForm struct { Domain string `form:"domain"` Host string `form:"host"` Port int `form:"port"` + UseSSL bool `form:"usessl"` BaseDN string `form:"base_dn"` Attributes string `form:"attributes"` Filter string `form:"filter"` @@ -37,6 +38,7 @@ func (f *AuthenticationForm) Name(field string) string { "Domain": "Domain name", "Host": "Host address", "Port": "Port Number", + "UseSSL": "Use SSL", "BaseDN": "Base DN", "Attributes": "Search attributes", "Filter": "Search filter", diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 493339cde..200490afb 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -18,6 +18,7 @@ type Ldapsource struct { Name string // canonical name (ie. corporate.ad) Host string // LDAP host Port int // port number + UseSSL bool // Use SSL BaseDN string // Base DN Attributes string // Attribut to search Filter string // Query filter to validate entry @@ -31,8 +32,8 @@ var ( ) // Add a new source (LDAP directory) to the global pool -func AddSource(name string, host string, port int, basedn string, attributes string, filter string, msadsaformat string) { - ldaphost := Ldapsource{name, host, port, basedn, attributes, filter, msadsaformat, true} +func AddSource(name string, host string, port int, usessl bool, basedn string, attributes string, filter string, msadsaformat string) { + ldaphost := Ldapsource{name, host, port, usessl, basedn, attributes, filter, msadsaformat, true} Authensource = append(Authensource, ldaphost) } @@ -52,7 +53,8 @@ func LoginUser(name, passwd string) (a string, r bool) { // searchEntry : search an LDAP source if an entry (name, passwd) is valide and in the specific filter func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) { - l, err := goldap.Dial("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port)) + l, err := ldapDial(ls) + if err != nil { log.Debug("LDAP Connect error, disabled source %s", ls.Host) ls.Enabled = false @@ -85,3 +87,11 @@ func (ls Ldapsource) SearchEntry(name, passwd string) (string, bool) { } return "", true } + +func ldapDial(ls Ldapsource) (*goldap.Conn, error) { + if ls.UseSSL { + return goldap.DialTLS("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port), nil) + } else { + return goldap.Dial("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port)) + } +} diff --git a/modules/base/conf.go b/modules/base/conf.go index 99bac9006..7d26623a5 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -195,11 +195,12 @@ func newLdapService() { ldapname := Cfg.MustValue(v, "name", v) ldaphost := Cfg.MustValue(v, "host") ldapport := Cfg.MustInt(v, "port", 389) + ldapusessl := Cfg.MustBool(v, "usessl", false) ldapbasedn := Cfg.MustValue(v, "basedn", "dc=*,dc=*") ldapattribute := Cfg.MustValue(v, "attribute", "mail") ldapfilter := Cfg.MustValue(v, "filter", "(*)") ldapmsadsaformat := Cfg.MustValue(v, "MSADSAFORMAT", "%s") - ldap.AddSource(ldapname, ldaphost, ldapport, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat) + ldap.AddSource(ldapname, ldaphost, ldapport, ldapusessl, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat) nbsrc++ log.Debug("%s added as LDAP source", ldapname) } diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 1822fd69a..70a23baad 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -44,6 +44,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { Ldapsource: ldap.Ldapsource{ Host: form.Host, Port: form.Port, + UseSSL: form.UseSSL, BaseDN: form.BaseDN, Attributes: form.Attributes, Filter: form.Filter, @@ -121,6 +122,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) { Ldapsource: ldap.Ldapsource{ Host: form.Host, Port: form.Port, + UseSSL: form.UseSSL, BaseDN: form.BaseDN, Attributes: form.Attributes, Filter: form.Filter, diff --git a/templates/admin/auths/edit.tmpl b/templates/admin/auths/edit.tmpl index 2c7a5754b..e1cef8cf9 100644 --- a/templates/admin/auths/edit.tmpl +++ b/templates/admin/auths/edit.tmpl @@ -53,6 +53,14 @@ +
+ +
+ +
+
+ +
@@ -147,4 +155,4 @@
-{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}} diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auths/new.tmpl index e5dcb4339..d09833fc7 100644 --- a/templates/admin/auths/new.tmpl +++ b/templates/admin/auths/new.tmpl @@ -51,6 +51,13 @@ +
+ +
+ +
+
+
@@ -158,4 +165,4 @@ }); }); -{{template "base/footer" .}} \ No newline at end of file +{{template "base/footer" .}}