deploy res.
Some checks failed
Deploy / Build (push) Failing after 13s

This commit is contained in:
amass 2024-11-21 00:03:57 +08:00
parent 1e67b110fe
commit 8052e0eb82
3 changed files with 22 additions and 4 deletions

View File

@ -36,6 +36,26 @@ jobs:
echo -n "提交消息: ${{ github.event.head_commit.message }}">> notify.tpl echo -n "提交消息: ${{ github.event.head_commit.message }}">> notify.tpl
cat notify.tpl | envsubst | jq -sR . | xargs -0 -I {} curl -H "Content-Type: application/json" -X POST -d '{"type":"text","msg":{} }' https://amass.fun/notify cat notify.tpl | envsubst | jq -sR . | xargs -0 -I {} curl -H "Content-Type: application/json" -X POST -d '{"type":"text","msg":{} }' https://amass.fun/notify
- run: resources/build.sh build - run: resources/build.sh build
- name: Copy wt resources to server
uses: appleboy/scp-action@v0.1.7
with:
host: ${{ vars.YUYUN_SERVER }}
username: ${{ vars.YUYUN_USER }}
password: ${{ secrets.SERVER_ROOT_PASSWORD }}
overwrite: true
strip_components: 6
source: /opt/Libraries/wt-4.11.1/share/Wt/resources/**
target: /root/Server/resources
- name: Copy app wt resources to server
uses: appleboy/scp-action@v0.1.7
with:
host: ${{ vars.YUYUN_SERVER }}
username: ${{ vars.YUYUN_USER }}
password: ${{ secrets.SERVER_ROOT_PASSWORD }}
overwrite: true
strip_components: 1
source: "resources/*.css,resources/*.xml"
target: /root/Server/resources
- name: Copy files to server - name: Copy files to server
uses: appleboy/scp-action@v0.1.7 uses: appleboy/scp-action@v0.1.7
with: with:
@ -77,7 +97,7 @@ jobs:
username: ${{ vars.YUYUN_USER }} username: ${{ vars.YUYUN_USER }}
password: ${{ secrets.SERVER_ROOT_PASSWORD }} password: ${{ secrets.SERVER_ROOT_PASSWORD }}
script: | script: |
systemctl restart openresty.service systemctl restart openresty.service; exit 0
- name: Notify-End - name: Notify-End
if: ${{ always() }} if: ${{ always() }}
run: | run: |

View File

@ -17,7 +17,7 @@
WebApplication::WebApplication(uint16_t port, const std::string &documentRoot) { WebApplication::WebApplication(uint16_t port, const std::string &documentRoot) {
try { try {
std::vector<std::string> args; std::vector<std::string> args;
args.push_back("--approot=./build"); args.push_back(std::format("--approot={}/resources", documentRoot));
args.push_back(std::format("--docroot={}", documentRoot)); args.push_back(std::format("--docroot={}", documentRoot));
args.push_back("--config=resources/wt_config.xml"); args.push_back("--config=resources/wt_config.xml");
args.push_back(std::format("--http-listen=127.0.0.1:{}", port)); args.push_back(std::format("--http-listen=127.0.0.1:{}", port));

View File

@ -441,10 +441,8 @@
--> -->
<trusted-proxies> <trusted-proxies>
<!-- loopback --> <!-- loopback -->
<!--
<proxy>127.0.0.1/8</proxy> <proxy>127.0.0.1/8</proxy>
<proxy>::1/128</proxy> <proxy>::1/128</proxy>
-->
<!-- link local --> <!-- link local -->
<!-- <!--
<proxy>169.254.0.0/16</proxy> <proxy>169.254.0.0/16</proxy>