summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjack <ac861219@gmail.com>2014-05-12 21:13:05 +0800
committerjack <ac861219@gmail.com>2014-05-12 21:13:05 +0800
commit7ec3f1b2d88c9f8f92c6377ec71fcd018ae80d9e (patch)
tree9ea41b008fa09470d6236191648912641255de32
parent1482bd8fb4d03f07db0d1a7f60d752357140a91f (diff)
downloadgitea-7ec3f1b2d88c9f8f92c6377ec71fcd018ae80d9e.tar.gz
gitea-7ec3f1b2d88c9f8f92c6377ec71fcd018ae80d9e.zip
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.
-rw-r--r--conf/etc/supervisord.conf (renamed from etc/supervisord.conf)12
-rw-r--r--gogs_supervisord.sh4
-rw-r--r--tmp/readme.txt1
3 files changed, 8 insertions, 9 deletions
diff --git a/etc/supervisord.conf b/conf/etc/supervisord.conf
index e273af3271..e17f50a847 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 fb8b9b53a6..2c7c6539bf 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 21984192e9..0000000000
--- a/tmp/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-here is log for supervisord and gogs \ No newline at end of file