commit 5a8b5225c0c630b78b6c2bbba13d1881024d913c
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2016-05-27T17:49:27Z |
|---|
| subject | Merge remote-tracking branch 'origin/master' into Astro |
|---|
commit 5a8b5225c0c630b78b6c2bbba13d1881024d913c
Merge: 549eb95 16377e0
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2016-05-27T17:49:27Z
Merge remote-tracking branch 'origin/master' into Astro
botan-start.py | 18 +++++++++---------
botanjs/compressor/closure.py | 3 ++-
botanjs/compressor/yui.py | 3 ++-
settings.ini | 3 +++
4 files changed, 16 insertions(+), 11 deletions(-)
diff --cc settings.ini
index bf7c6a3,1568871..ab7203a
--- a/settings.ini
+++ b/settings.ini
@@@ -8,6 -8,9 +8,9 @@@ Cache = ${SiteRoot}/cach
[BotanJS]
SrcDir = ${Paths:Runtime}/botanjs/src
-CeleryBroker = redis://:${REDIS_PASS}@123.123.123.123:1234/9
+REDIS_PASS = RJszCzFoeZaULKyY3w5W0kMVF4Ei5ZsqMVexk8wxFzQEYnRuLsdGOkHIAXYe4XNuByZHfbee7GxLsuo9xvEIKdYVpvVRYMUbcf25cuOIWV1sLgxhRv0q9KtH7cLpBroa1BIiqHtbzkd3erenel6siIqyHQxV0jPVFfm0ayCvYmdHiVL1VphBpTSnAX8JNvR2Iim5Q7aGiDpLxQD0nnnc1uQuJjwBNA3jkjddMMvHgN8iYleq4SA2xycqNNFzejlT
-REDIS_PASS = PASSWORD_FOR_REDIS_DB
+CeleryBroker = redis://:${REDIS_PASS}@192.168.80.100:6379/9
+
+ ClosureCompiler = /opt/utils/closure.jar
+ YuiCompressor = /opt/utils/yuicompressor.jar