diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-10-13 03:24:59 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-10-13 03:24:59 -0400 |
| commit | 80dd548b39146cde55402a65893e0317fbe04c94 (patch) | |
| tree | 394f4e3b0798cea4b886aab36eeafe9bcc9059a3 | |
| parent | 451f328a4cd651259bf173f99a37cd0feb866e32 (diff) | |
| parent | 9e4c2afad7b4593b388a38996e6fbc071d942e85 (diff) | |
| download | gitea-80dd548b39146cde55402a65893e0317fbe04c94.tar.gz gitea-80dd548b39146cde55402a65893e0317fbe04c94.zip | |
Merge pull request #556 from jacksonpan/master
update the supervisor script and conf
| -rw-r--r-- | etc/supervisord.conf | 12 | ||||
| -rw-r--r-- | scripts/autoboot.sh | 2 | ||||
| -rwxr-xr-x | scripts/gogs_supervisord.sh | 11 |
3 files changed, 16 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/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" 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 |