如果你看到了这个页面,证明你访问的不是nginx监听的端口,祝你好运"
-"div>"
+"
Luna是单独部署的一个程序,你需要部署luna,koko,
如果你看到了"
+"这个页面,证明你访问的不是nginx监听的端口,祝你好运
"
#: ops/api/celery.py:54
msgid "Waiting task start"
diff --git a/apps/ops/inventory.py b/apps/ops/inventory.py
index 694957b14..ffd7e8619 100644
--- a/apps/ops/inventory.py
+++ b/apps/ops/inventory.py
@@ -15,7 +15,7 @@ logger = get_logger(__file__)
class JMSBaseInventory(BaseInventory):
- windows_ssh_default_ssh = settings.WINDOWS_SSH_DEFAULT_SHELL
+ windows_ssh_default_shell = settings.WINDOWS_SSH_DEFAULT_SHELL
def convert_to_ansible(self, asset, run_as_admin=False):
info = {
@@ -35,7 +35,7 @@ class JMSBaseInventory(BaseInventory):
if asset.is_windows():
info["vars"].update({
"ansible_connection": "ssh",
- "ansible_shell_type": self.windows_ssh_default_ssh,
+ "ansible_shell_type": self.windows_ssh_default_shell,
})
for label in asset.labels.all():
info["vars"].update({
diff --git a/apps/terminal/views/terminal.py b/apps/terminal/views/terminal.py
index 6396094ab..56e3a4dc9 100644
--- a/apps/terminal/views/terminal.py
+++ b/apps/terminal/views/terminal.py
@@ -135,4 +135,4 @@ class WebTerminalView(View):
class WebSFTPView(View):
def get(self, request, *args, **kwargs):
- return redirect('/coco/elfinder/sftp/?' + request.GET.urlencode())
+ return redirect('/koko/elfinder/sftp/?' + request.GET.urlencode())
diff --git a/jms b/jms
index 805faac50..d67c2fa35 100755
--- a/jms
+++ b/jms
@@ -205,6 +205,10 @@ def parse_service(s):
]
if s == 'all':
return all_services
+ elif s == "web":
+ return ['gunicorn', 'flower']
+ elif s == "task":
+ return ["celery_ansible", "celery_default", "beat"]
elif s == 'gunicorn':
return ['gunicorn', 'flower']
elif s == "celery":
@@ -474,7 +478,7 @@ if __name__ == '__main__':
)
parser.add_argument(
"service", type=str, default="all", nargs="?",
- choices=("all", "gunicorn", "celery", "beat", "celery,beat", "flower"),
+ choices=("all", "web", "task", "gunicorn", "celery", "beat", "celery,beat", "flower"),
help="The service to start",
)
parser.add_argument('-d', '--daemon', nargs="?", const=1)