annotate init.d/supervisord.conf @ 4125:aa3b55946089 rhodecode-2.2.5-gpl

Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
author "Bradley M. Kuhn" <bkuhn@ebb.org>
date Mon, 26 May 2014 20:21:00 -0400
parents e4eabd2558b6
children 99ad9d0af1a3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2483
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
1 ; RhodeCode Supervisord
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
2 ; ##########################
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
3 ; for help see http://supervisord.org/configuration.html
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
4 ; ##########################
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
5
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
6 [inet_http_server] ; inet (TCP) server disabled by default
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
7 port=127.0.0.1:9001 ; (ip_address:port specifier, *:port for all iface)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
8 ;username=user ; (default is no username (open server))
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
9 ;password=123 ; (default is no password (open server))
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
10
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
11 [supervisord]
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
12 logfile=/%(here)s/supervisord_rhodecode.log ; (main log file;default $CWD/supervisord.log)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
13 logfile_maxbytes=50MB ; (max main logfile bytes b4 rotation;default 50MB)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
14 logfile_backups=10 ; (num of main logfile rotation backups;default 10)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
15 loglevel=info ; (log level;default info; others: debug,warn,trace)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
16 pidfile=/%(here)s/supervisord_rhodecode.pid ; (supervisord pidfile;default supervisord.pid)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
17 nodaemon=true ; (start in foreground if true;default false)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
18 minfds=1024 ; (min. avail startup file descriptors;default 1024)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
19 minprocs=200 ; (min. avail process descriptors;default 200)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
20 umask=022 ; (process file creation umask;default 022)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
21 user=marcink ; (default is current user, required if root)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
22 ;identifier=supervisor ; (supervisord identifier, default is 'supervisor')
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
23 ;directory=/tmp ; (default is not to cd during start)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
24 ;nocleanup=true ; (don't clean up tempfiles at start;default false)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
25 ;childlogdir=/tmp ; ('AUTO' child log dir, default $TEMP)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
26 environment=HOME=/home/marcink ; (key value pairs to add to environment)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
27 ;strip_ansi=false ; (strip ansi escape codes in logs; def. false)
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
28
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
29 ; the below section must remain in the config file for RPC
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
30 ; (supervisorctl/web interface) to work, additional interfaces may be
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
31 ; added by defining them in separate rpcinterface: sections
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
32 [rpcinterface:supervisor]
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
33 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
34
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
35 [supervisorctl]
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
36 serverurl=http://127.0.0.1:9001 ; use an http:// url to specify an inet socket
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
37 ;username=user ; should be same as http_username if set
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
38 ;password=123 ; should be same as http_password if set
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
39 ;prompt=mysupervisor ; cmd line prompt (default "supervisor")
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
40 ;history_file=~/.sc_history ; use readline history if available
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
41
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
42
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
43 ; restart with supervisorctl restart rhodecode:*
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
44 [program:rhodecode]
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
45 numprocs = 1
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
46 numprocs_start = 5000 # possible should match ports
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
47 directory=/home/marcink/rhodecode-dir
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
48 command = /home/marcink/v-env/bin/paster serve rc.ini
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
49 process_name = %(program_name)s_%(process_num)04d
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
50 redirect_stderr=true
e4eabd2558b6 added example supervisord config to init scripts
Marcin Kuzminski <marcin@python-works.com>
parents:
diff changeset
51 stdout_logfile=/%(here)s/rhodecode.log