Mercurial > kallithea
annotate init.d/kallithea-daemon-redhat @ 6532:33b71a130b16
templates: properly escape inline JavaScript values
TLDR: Kallithea has issues with escaping values for use in inline JS.
Despite judicious poking of the code, no actual security vulnerabilities
have been found, just lots of corner-case bugs. This patch fixes those,
and hardens the code against actual security issues.
The long version:
To embed a Python value (typically a 'unicode' plain-text value) in a
larger file, it must be escaped in a context specific manner. Example:
>>> s = u'<script>alert("It\'s a trap!");</script>'
1) Escaped for insertion into HTML element context
>>> print cgi.escape(s)
<script>alert("It's a trap!");</script>
2) Escaped for insertion into HTML element or attribute context
>>> print h.escape(s)
<script>alert("It's a trap!");</script>
This is the default Mako escaping, as usually used by Kallithea.
3) Encoded as JSON
>>> print json.dumps(s)
"<script>alert(\"It's a trap!\");</script>"
4) Escaped for insertion into a JavaScript file
>>> print '(' + json.dumps(s) + ')'
("<script>alert(\"It's a trap!\");</script>")
The parentheses are not actually required for strings, but may be needed
to avoid syntax errors if the value is a number or dict (object).
5) Escaped for insertion into a HTML inline <script> element
>>> print h.js(s)
("\x3cscript\x3ealert(\"It's a trap!\");\x3c/script\x3e")
Here, we need to combine JS and HTML escaping, further complicated by
the fact that "<script>" tag contents can either be parsed in XHTML mode
(in which case '<', '>' and '&' must additionally be XML escaped) or
HTML mode (in which case '</script>' must be escaped, but not using HTML
escaping, which is not available in HTML "<script>" tags). Therefore,
the XML special characters (which can only occur in string literals) are
escaped using JavaScript string literal escape sequences.
(This, incidentally, is why modern web security best practices ban all
use of inline JavaScript...)
Unsurprisingly, Kallithea does not do (5) correctly. In most cases,
Kallithea might slap a pair of single quotes around the HTML escaped
Python value. A typical benign example:
$('#child_link').html('${_('No revisions')}');
This works in English, but if a localized version of the string contains
an apostrophe, the result will be broken JavaScript. In the more severe
cases, where the text is user controllable, it leaves the door open to
injections. In this example, the script inserts the string as HTML, so
Mako's implicit HTML escaping makes sense; but in many other cases, HTML
escaping is actually an error, because the value is not used by the
script in an HTML context.
The good news is that the HTML escaping thwarts attempts at XSS, since
it's impossible to inject syntactically valid JavaScript of any useful
complexity. It does allow JavaScript errors and gibberish to appear on
the page, though.
In these cases, the escaping has been fixed to use either the new 'h.js'
helper, which does JavaScript escaping (but not HTML escaping), OR the
new 'h.jshtml' helper (which does both), in those cases where it was
unclear if the value might be used (by the script) in an HTML context.
Some of these can probably be "relaxed" from h.jshtml to h.js later, but
for now, using h.jshtml fixes escaping and doesn't introduce new errors.
In a few places, Kallithea JSON encodes values in the controller, then
inserts the JSON (without any further escaping) into <script> tags. This
is also wrong, and carries actual risk of XSS vulnerabilities. However,
in all cases, security vulnerabilities were narrowly avoided due to other
filtering in Kallithea. (E.g. many special characters are banned from
appearing in usernames.) In these cases, the escaping has been fixed
and moved to the template, making it immediately visible that proper
escaping has been performed.
Mini-FAQ (frequently anticipated questions):
Q: Why do everything in one big, hard to review patch?
Q: Why add escaping in specific case FOO, it doesn't seem needed?
Because the goal here is to have "escape everywhere" as the default
policy, rather than identifying individual bugs and fixing them one
by one by adding escaping where needed. As such, this patch surely
introduces a lot of needless escaping. This is no different from
how Mako/Pylons HTML escape everything by default, even when not
needed: it's errs on the side of needless work, to prevent erring
on the side of skipping required (and security critical) work.
As for reviewability, the most important thing to notice is not where
escaping has been introduced, but any places where it might have been
missed (or where h.jshtml is needed, but h.js is used).
Q: The added escaping is kinda verbose/ugly.
That is not a question, but yes, I agree. Hopefully it'll encourage us
to move away from inline JavaScript altogether. That's a significantly
larger job, though; with luck this patch will keep us safe and secure
until such a time as we can implement the real fix.
Q: Why not use Mako filter syntax ("${val|h.js}")?
Because of long-standing Mako bug #140, preventing use of 'h' in
filters.
Q: Why not work around bug #140, or even use straight "${val|js}"?
Because Mako still applies the default h.escape filter before the
explicitly specified filters.
Q: Where do we go from here?
Longer term, we should stop doing variable expansions in script blocks,
and instead pass data to JS via e.g. data attributes, or asynchronously
using AJAX calls. Once we've done that, we can remove inline JavaScript
altogether in favor of separate script files, and set a strict Content
Security Policy explicitly blocking inline scripting, and thus also the
most common kind of cross-site scripting attack.
author | Søren Løvborg <sorenl@unity3d.com> |
---|---|
date | Tue, 28 Feb 2017 17:19:00 +0100 |
parents | e285bb7abb28 |
children | 2c3d30095d5e |
rev | line source |
---|---|
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
1545
a7bee2a5de67
Added header for redhat init.d script
Marcin Kuzminski <marcin@python-works.com>
parents:
1542
diff
changeset
|
2 ######################################## |
a7bee2a5de67
Added header for redhat init.d script
Marcin Kuzminski <marcin@python-works.com>
parents:
1542
diff
changeset
|
3 #### THIS IS A REDHAT INIT.D SCRIPT #### |
a7bee2a5de67
Added header for redhat init.d script
Marcin Kuzminski <marcin@python-works.com>
parents:
1542
diff
changeset
|
4 ######################################## |
a7bee2a5de67
Added header for redhat init.d script
Marcin Kuzminski <marcin@python-works.com>
parents:
1542
diff
changeset
|
5 |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
6 ################################################## |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
7 # |
4212
24c0d584ba86
General renaming to Kallithea
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4190
diff
changeset
|
8 # Kallithea server startup script |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
9 # Recommended default-startup: 2 3 4 5 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
10 # Recommended default-stop: 0 1 6 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
11 # |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
12 ################################################## |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
13 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
14 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
15 APP_NAME="kallithea" |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
16 # the location of your app |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
17 # since this is a web app, it should go in /var/www |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
18 APP_PATH="/var/www/$APP_NAME" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
19 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
20 CONF_NAME="production.ini" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
21 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
22 # write to wherever the PID should be stored, just ensure |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
23 # that the user you run paster as has the appropriate permissions |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
24 # same goes for the log file |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
25 PID_PATH="/var/run/kallithea/pid" |
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
26 LOG_PATH="/var/log/kallithea/kallithea.log" |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
27 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
28 # replace this with the path to the virtual environment you |
4212
24c0d584ba86
General renaming to Kallithea
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4190
diff
changeset
|
29 # made for Kallithea |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
30 PYTHON_PATH="/opt/python_virtualenvironments/kallithea-venv" |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
31 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
32 RUN_AS="kallithea" |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
33 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
34 DAEMON="$PYTHON_PATH/bin/paster" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
35 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
36 DAEMON_OPTS="serve --daemon \ |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
37 --user=$RUN_AS \ |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
38 --group=$RUN_AS \ |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
39 --pid-file=$PID_PATH \ |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
40 --log-file=$LOG_PATH $APP_PATH/$CONF_NAME" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
41 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
42 DESC="kallithea-server" |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
43 LOCK_FILE="/var/lock/subsys/$APP_NAME" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
44 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
45 # source CentOS init functions |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
46 . /etc/init.d/functions |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
47 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
48 RETVAL=0 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
49 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
50 remove_pid () { |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
51 rm -f ${PID_PATH} |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
52 rmdir `dirname ${PID_PATH}` |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
53 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
54 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
55 ensure_pid_dir () { |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
56 PID_DIR=`dirname ${PID_PATH}` |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
57 if [ ! -d ${PID_DIR} ] ; then |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
58 mkdir -p ${PID_DIR} |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
59 chown -R ${RUN_AS}:${RUN_AS} ${PID_DIR} |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
60 chmod 755 ${PID_DIR} |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
61 fi |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
62 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
63 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
64 start_kallithea () { |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
65 ensure_pid_dir |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
66 PYTHON_EGG_CACHE="/tmp" daemon --pidfile $PID_PATH \ |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
67 --user $RUN_AS "$DAEMON $DAEMON_OPTS" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
68 RETVAL=$? |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
69 [ $RETVAL -eq 0 ] && touch $LOCK_FILE |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
70 return $RETVAL |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
71 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
72 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
73 stop_kallithea () { |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
74 if [ -e $LOCK_FILE ]; then |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
75 killproc -p $PID_PATH |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
76 RETVAL=$? |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
77 rm -f $LOCK_FILE |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
78 rm -f $PID_PATH |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
79 else |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
80 RETVAL=1 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
81 fi |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
82 return $RETVAL |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
83 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
84 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
85 status_kallithea() { |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
86 if [ -e $LOCK_FILE ]; then |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
87 # exit with non-zero to indicate failure |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
88 RETVAL=1 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
89 else |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
90 RETVAL=0 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
91 fi |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
92 return $RETVAL |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
93 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
94 |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
95 restart_kallithea () { |
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
96 stop_kallithea |
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
97 start_kallithea |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
98 RETVAL=$? |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
99 } |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
100 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
101 case "$1" in |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
102 start) |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
103 echo -n $"Starting $DESC: " |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
104 start_kallithea |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
105 echo |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
106 ;; |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
107 stop) |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
108 echo -n $"Stopping $DESC: " |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
109 stop_kallithea |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
110 echo |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
111 ;; |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
112 status) |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
113 status_kallithea |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
114 RETVAL=$? |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
115 if [ ! $RETVAL -eq 0 ]; then |
4212
24c0d584ba86
General renaming to Kallithea
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4190
diff
changeset
|
116 echo "Kallithea server is running..." |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
117 else |
4212
24c0d584ba86
General renaming to Kallithea
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
4190
diff
changeset
|
118 echo "Kallithea server is stopped." |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
119 fi |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
120 ;; |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
121 restart) |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
122 echo -n $"Restarting $DESC: " |
4190
99ad9d0af1a3
Rename init scripts and fix references inside them
Bradley M. Kuhn <bkuhn@sfconservancy.org>
parents:
1545
diff
changeset
|
123 restart_kallithea |
1542
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
124 echo |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
125 ;; |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
126 *) |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
127 echo $"Usage: $0 {start|stop|restart|status}" |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
128 RETVAL=1 |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
129 ;; |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
130 esac |
238b2805851f
added a RedHat-based init.d startup script
Les Peabody <lpeabody@gmail.com>
parents:
diff
changeset
|
131 |
6370
e285bb7abb28
scripts: apply whitespace cleanup to more files - opt out instead of opt in
Mads Kiilerich <mads@kiilerich.com>
parents:
4212
diff
changeset
|
132 exit $RETVAL |