diff --git a/Jenkinsfile b/Jenkinsfile index 1ab67b1..ebd453e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,9 +28,7 @@ def generateStage(name) { set -e set -x cp -rfv antos/webapps/build/opt/www/htdocs/os antos/frontend/$tag/build/opt/www/htdocs - cp -rfv antos/webapps/build/opt/www/htdocs/silk antos/frontend/$tag/build/opt/www/htdocs - cp -rfv antos/webapps/build/opt/www/htdocs/mimes.json antos/frontend/$tag/build/opt/www/htdocs - rm -rf antos/frontend/$tag/build/opt/www/htdocs/os/rst + mv -rfv antos/frontend/$tag/build/opt/www/htdocs/os/mimes.json antos/frontend/$tag/build/opt/www/htdocs # release antos doc [ -d "/home/dany/public/antos-release/doc/$tag" ] && rm -rf /home/dany/public/antos-release/doc/$tag || true @@ -76,13 +74,14 @@ pipeline{ mkdir -p antos/webapps ''' copyArtifacts(projectName: 'gitea-sync/ant-http/master', target: 'antos/backend'); - copyArtifacts(projectName: 'gitea-sync/antd-lua-plugin/master', target: 'antos/backend'); + copyArtifacts(projectName: 'gitea-sync/luafcgi/master', target: 'antos/backend'); copyArtifacts(projectName: 'gitea-sync/antd-tunnel-plugin/master', target: 'antos/backend'); copyArtifacts(projectName: 'gitea-sync/antd-wvnc-plugin/master', target: 'antos/backend'); copyArtifacts(projectName: 'gitea-sync/antd-tunnel-publishers/master', target: 'antos/backend'); copyArtifacts(projectName: 'luasocket', target: 'antos/backend'); copyArtifacts(projectName: 'luasec', target: 'antos/backend'); - copyArtifacts(projectName: 'gitea-sync/antd-web-apps/master', target: 'antos/webapps'); + copyArtifacts(projectName: 'gitea-sync/antos-backend/silk', target: 'antos/backend'); + copyArtifacts(projectName: 'gitea-sync/antos-backend/master', target: 'antos/webapps'); script { parallel parallelStagesMap; diff --git a/antd-config.ini b/antd-config.ini index 43d9f74..1c75a62 100644 --- a/antd-config.ini +++ b/antd-config.ini @@ -24,7 +24,7 @@ debug_enable = 0 # ssl.cipher=ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256 [PORT:8888] -plugins = lua,tunnel,wvnc +plugins = fcgi,tunnel,wvnc # DONOT edit this option htdocs=./opt/www/htdocs # Edit this option to enable SSL @@ -69,10 +69,12 @@ application/x-font-woff=woff,woff2 application/x-font-otf=otf audio/mpeg=mp3,mpeg -[PLUGIN:lua] -name = lua +[PLUGIN:fcgi] +name = fcgi autoload = 1 -file_type = lua,ls +file_type = lua +bin = ./opt/www/bin/luad +socket = unix:/tmp/fcgi.sock [PLUGIN:tunnel] autoload = 1