diff options
| author | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
|---|---|---|
| committer | evolvedlight <steve@evolvedlight.co.uk> | 2014-10-13 20:30:31 +0100 |
| commit | 8d2a6fc484b540819e211d52b8d54e97269f0918 (patch) | |
| tree | e5bfe7d3937bb2d18ba2fb50ea72514bd5bb4e13 /scripts | |
| parent | 29ac3980ffdb5faa525d77fddc109c9023ebe257 (diff) | |
| parent | 89bd994c836ecc9b6ceb80849f470521e1b15917 (diff) | |
Merge remote-tracking branch 'upstream/dev'
Conflicts:
models/repo.go
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/autoboot.sh | 2 | ||||
| -rwxr-xr-x | scripts/gogs_supervisord.sh | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/scripts/autoboot.sh b/scripts/autoboot.sh new file mode 100755 index 00000000..eb16d581 --- /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 4488960e..01667584 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 |