Firq/firq-dev-website
Firq/firq-dev-website
1
0
Fork 0
Code Issues Pull requests Projects Releases 119 Packages Wiki Activity Actions

Merge branch 'dev' into 'main'

Browse source 
Moving serve to local

See merge request Firq/fgosite!8
This commit is contained in:
Firq 2023-08-04 20:16:46 +00:00
commit d5448a9680
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.gitlab-ci.yml
View file

@ -65,7 +65,7 @@ deploy-site:
- echo "Copying to proxmox machine" - echo "Copying to proxmox machine"
- rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/public - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/public
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find maintenance public -maxdepth 1 -printf '%p\n'; screen -S firq_dev-public -dm serve public/ -p 9000" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find maintenance public -maxdepth 1 -printf "%p\n"; screen -S firq_dev-public -dm serve public/ -p 9000'
- echo "Website is up on https://firq.dev/" - echo "Website is up on https://firq.dev/"
deploy-testing: deploy-testing:
@ -84,7 +84,7 @@ deploy-testing:
- echo "Copying to proxmox machine" - echo "Copying to proxmox machine"
- rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/staging - rsync -az --stats public/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/staging
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find staging -maxdepth 1 -printf '%p\n'; screen -S firq_dev-staging -dm serve staging/ -p 9100" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find staging -maxdepth 1 -printf "%p\n"; screen -S firq_dev-staging -dm serve staging/ -p 9100'
- echo "Staging environment is up!" - echo "Staging environment is up!"
unlighthouse: unlighthouse:
@ -123,7 +123,7 @@ unlighthouse-publish:
- echo "Copying to proxmox machine" - echo "Copying to proxmox machine"
- rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/unlighthouse - rsync -az --stats unlighthouse-reports/* $DEPLOY_USER@$DEPLOY_HOST:~/firq_dev/unlighthouse
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "cd firq_dev; find unlighthouse -maxdepth 1 -printf '%p\n'; screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p 9101" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; cd firq_dev; find unlighthouse -maxdepth 1 -printf "%p\n"; screen -S firq_dev-unlighthouse -dm serve unlighthouse/ -p 9101'
- echo "Unlighthouse results are up!" - echo "Unlighthouse results are up!"
success_notification: success_notification:
@ -165,7 +165,7 @@ maintenance-mode:
- echo "Stopping screen session" - echo "Stopping screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
- echo "Enabeling maintenance mode" - echo "Enabeling maintenance mode"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
- echo "Maintenance Website is up on https://firq.dev/" - echo "Maintenance Website is up on https://firq.dev/"
redeploy-site: redeploy-site:
@ -181,7 +181,7 @@ redeploy-site:
- echo "Stopping screen session" - echo "Stopping screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill" || true - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill" || true
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-public -dm serve firq_dev/public/ -p 9000" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-public -dm serve firq_dev/public/ -p 9000'
- echo "Website is up on https://firq.dev/" - echo "Website is up on https://firq.dev/"
redeploy-staging: redeploy-staging:
@ -196,7 +196,7 @@ redeploy-staging:
- echo "Stopping screen session" - echo "Stopping screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-staging kill" || true - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-staging kill" || true
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-staging -dm serve firq_dev/staging/ -p 9100" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-staging -dm serve firq_dev/staging/ -p 9100'
- echo "Staging environment is up!" - echo "Staging environment is up!"
redeploy-unlighthouse: redeploy-unlighthouse:
@ -211,7 +211,7 @@ redeploy-unlighthouse:
- echo "Stopping screen session" - echo "Stopping screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-unlighthouse kill" || true - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-unlighthouse kill" || true
- echo "Restarting screen session" - echo "Restarting screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-unlighthouse -dm serve firq_dev/unlighthouse/ -p 9101" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-unlighthouse -dm serve firq_dev/unlighthouse/ -p 9101'
- echo "Staging environment is up!" - echo "Staging environment is up!"
maintenance-deploy: maintenance-deploy:
@ -226,5 +226,5 @@ maintenance-deploy:
- echo "Stopping screen session" - echo "Stopping screen session"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true - ssh $DEPLOY_USER@$DEPLOY_HOST "screen -X -S firq_dev-public kill;" || true
- echo "Enabeling maintenance mode" - echo "Enabeling maintenance mode"
- ssh $DEPLOY_USER@$DEPLOY_HOST "screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000" - ssh $DEPLOY_USER@$DEPLOY_HOST 'PATH="$HOME/.local/bin:$PATH"; screen -S firq_dev-maintenance -dm serve firq_dev/maintenance/ -p 9000'
- echo "Maintenance Website is up on https://firq.dev/" - echo "Maintenance Website is up on https://firq.dev/"

16
serve.json
View file

@ -4,16 +4,24 @@
"etag": true, "etag": true,
"headers": [ "headers": [
{ {
"source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)", "source" : "**/*.html",
"headers" : [{ "headers" : [{
"key" : "Cache-Control", "key" : "Cache-Control",
"value" : "no-cache" "value" : "no-cache"
}] }]
}, { },
"source" : "404.html", {
"source" : "**/*.css",
"headers" : [{ "headers" : [{
"key" : "Cache-Control", "key" : "Cache-Control",
"value" : "no-cache" "value" : "max-age=86400"
}]
},
{
"source" : "**/*.@(jpg|jpeg|gif|png|webp|svg)",
"headers" : [{
"key" : "Cache-Control",
"value" : "max-age=86400"
}] }]
} }
] ]