From 2dd4ab65c74543d60b8691c0488efc0e5bb08684 Mon Sep 17 00:00:00 2001 From: jacksonpan <530933208@qq.com> Date: Mon, 13 Oct 2014 14:23:55 +0800 Subject: [PATCH 1/2] update the supervisor script and conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit now, we auto add the start.sh -> /usr/bin/gogs_start, then supervisor needn’t the full path, detail please see the commit. and how to use: entry gogs root path, then input scripts/gogs_supervisord.sh restart (add sudo if need) --- etc/supervisord.conf | 12 ++++++------ scripts/gogs_supervisord.sh | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/etc/supervisord.conf b/etc/supervisord.conf index e17f50a847..4f4d40eaea 100644 --- a/etc/supervisord.conf +++ b/etc/supervisord.conf @@ -1,12 +1,12 @@ [unix_http_server] -file=/tmp/supervisor.sock ; path to your socket file +file=log/supervisor.sock ; path to your socket file [supervisord] 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=log/supervisord.pid ; pidfile location nodaemon=false ; run supervisord as a daemon minfds=1024 ; number of startup file descriptors minprocs=200 ; number of process descriptors @@ -17,10 +17,10 @@ childlogdir=log supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface [supervisorctl] -serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket +serverurl=unix://log/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 = gogs_start autostart = true -stdout_logfile = log/supervisor-gogs-stderr.log -stderr_logfile = log/supervisor-gogs-error.log \ No newline at end of file +stdout_logfile = log/supervisor-gogs-out.log +stderr_logfile = log/supervisor-gogs-err.log diff --git a/scripts/gogs_supervisord.sh b/scripts/gogs_supervisord.sh index 4488960e6a..0166758486 100755 --- a/scripts/gogs_supervisord.sh +++ b/scripts/gogs_supervisord.sh @@ -1,10 +1,15 @@ #!/bin/sh -echo 'plase remember to modify the command path in etc/supervisord.conf(line 23)' - -PID="/tmp/supervisord.pid" +PID="log/supervisord.pid" CONF="etc/supervisord.conf" +EXEPATH='/usr/bin/gogs_start' +if [ ! -f $EXEPATH ]; then + gogs_scripts_path=$(cd `dirname $0`; pwd) + echo $gogs_scripts_path + sudo ln -s $gogs_scripts_path'/start.sh' /usr/bin/gogs_start +fi + LOGDIR="log" if [ ! -d $LOGDIR ]; then mkdir $LOGDIR From 9e4c2afad7b4593b388a38996e6fbc071d942e85 Mon Sep 17 00:00:00 2001 From: jacksonpan <530933208@qq.com> Date: Mon, 13 Oct 2014 14:32:08 +0800 Subject: [PATCH 2/2] add auto start script how to use: vim /etc/rc.local, then add cd /home/git/gogs; scripts/autoboot.sh (goes path you can replace your path) --- scripts/autoboot.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 scripts/autoboot.sh diff --git a/scripts/autoboot.sh b/scripts/autoboot.sh new file mode 100644 index 0000000000..eb16d58170 --- /dev/null +++ b/scripts/autoboot.sh @@ -0,0 +1,2 @@ +#!/bin/sh +su git -c "/home/git/gogs/scripts/gogs_supervisord.sh restart"