m26508134
/
docklet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a bug

This commit is contained in:
zhuyj17 2017-05-02 09:23:36 +08:00
parent b4834b2dd8
commit 9652d2551f
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/docklet-master
View File

@ -58,19 +58,16 @@ DAEMON_NAME_WEB=docklet-web
PIDFILE_WEB=$RUN_DIR/docklet-web.pid PIDFILE_WEB=$RUN_DIR/docklet-web.pid
DAEMON_OPTS_WEB= DAEMON_OPTS_WEB=
<<<<<<< HEAD
# settings for docklet proxy, which is required for web access # settings for docklet proxy, which is required for web access
DAEMON_PROXY=`which configurable-http-proxy` DAEMON_PROXY=`which configurable-http-proxy`
DAEMON_NAME_PROXY=docklet-proxy DAEMON_NAME_PROXY=docklet-proxy
PIDFILE_PROXY=$RUN_DIR/proxy.pid PIDFILE_PROXY=$RUN_DIR/proxy.pid
DAEMON_OPTS_PROXY= DAEMON_OPTS_PROXY=
=======
# settings for docklet user # settings for docklet user
DAEMON_USER_MODULE=$DOCKLET_USER/user.py DAEMON_USER_MODULE=$DOCKLET_USER/user.py
DAEMON_NAME_USER=docklet-user DAEMON_NAME_USER=docklet-user
PIDFILE_USER=$RUN_DIR/docklet-user.pid PIDFILE_USER=$RUN_DIR/docklet-user.pid
DAEMON_OPTS_USER= DAEMON_OPTS_USER=
>>>>>>> aeeaa1593aaa14d02907e7fa10fa7b67ce617753
RUNNING_CONFIG=$FS_PREFIX/local/docklet-running.conf RUNNING_CONFIG=$FS_PREFIX/local/docklet-running.conf
export CONFIG=$RUNNING_CONFIG export CONFIG=$RUNNING_CONFIG