commit 1829b333dfe1304210dd31e439c4e8ce9e01e079
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2016-05-27T16:25:22Z |
|---|
| subject | Merge remote-tracking branch 'origin/master' into Astro |
|---|
commit 1829b333dfe1304210dd31e439c4e8ce9e01e079
Merge: e7f169a 41f1ab4
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2016-05-27T16:25:22Z
Merge remote-tracking branch 'origin/master' into Astro
.gitignore | 1 +
botan-start.py | 80 ++++++++--------------
botanjs/config.py | 2 +
.../test/Dandelian.CSSAnimations.MovieClip.html | 40 -----------
.../templates/test/System.Net.ClassLoader.html | 25 -------
.../service/templates/test/System.utils.IKey.html | 13 ----
botanjs/service/templates/test_list.html | 19 -----
botanjs/service/webapi.py | 37 +++-------
env/README.md | 1 +
settings.ini | 10 +--
10 files changed, 46 insertions(+), 182 deletions(-)
diff --cc settings.ini
index fba8f52,559e1da..3505626
--- a/settings.ini
+++ b/settings.ini
@@@ -6,12 -8,6 +8,6 @@@ 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
-
-
- [Service]
- user = www-data
- group = www-data