Merge branch 'master' into dev

3 years ago · c2f454b36b
parent 01362c76f9 fbac71e542
commit c2f454b36b
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -135,4 +135,6 @@ plugins/openlitespeed
 plugins/gdrive/
 data/ipv6.pl
 data/restart.pl
-pip-selfcheck.json
+pip-selfcheck.json
+data/ssl.pl
+
--- a/plugins/mysql/versions/8.0/install.sh
+++ b/plugins/mysql/versions/8.0/install.sh
@ -1,3 +1,5 @@
+export MAKEJN=-j12
+
 # -*- coding: utf-8 -*-
 #!/bin/bash

--- a/task.py
+++ b/task.py
@ -534,7 +534,7 @@ if __name__ == "__main__":
    oar = setDaemon(oar)
    oar.start()

-    # OpenResty Auto Restart Start
+    # Panel Restart Start
    rps = threading.Thread(target=restartPanelService)
    rps = setDaemon(rps)
    rps.start()