set path precedence for / rather than /static/
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
935c474878
commit
eccc0f20f0
49
.drone.yml
49
.drone.yml
|
@ -1,33 +1,32 @@
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: build and publish docker image
|
name: build, publish docker image, deploy
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
#- name: docker
|
- name: docker
|
||||||
# image: plugins/docker
|
image: plugins/docker
|
||||||
# settings:
|
settings:
|
||||||
# username:
|
username:
|
||||||
# from_secret: gitea_packpub_username
|
from_secret: gitea_packpub_username
|
||||||
# password:
|
password:
|
||||||
# from_secret: gitea_packpub_password
|
from_secret: gitea_packpub_password
|
||||||
# registry: git.hatecomputers.club
|
registry: git.hatecomputers.club
|
||||||
# repo: git.hatecomputers.club/hatecomputers/hatecomputers.club
|
repo: git.hatecomputers.club/hatecomputers/hatecomputers.club
|
||||||
# tags:
|
tags:
|
||||||
# - latest
|
- latest
|
||||||
# - main
|
- main
|
||||||
- name: ssh
|
- name: ssh
|
||||||
image: appleboy/drone-ssh
|
image: appleboy/drone-ssh
|
||||||
settings:
|
settings:
|
||||||
host: hatecomputers.club
|
host: hatecomputers.club
|
||||||
username: root
|
username: root
|
||||||
key:
|
key:
|
||||||
from_secret: cd_ssh_key
|
from_secret: cd_ssh_key
|
||||||
port: 22
|
port: 22
|
||||||
command_timeout: 2m
|
command_timeout: 2m
|
||||||
script:
|
script:
|
||||||
- systemctl restart docker-compose@hatecomputers-club
|
- systemctl restart docker-compose@hatecomputers-club
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
- main
|
- main
|
||||||
|
|
|
@ -78,7 +78,7 @@ func MakeServer(argv *args.Arguments, dbConn *sql.DB) *http.Server {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
|
|
||||||
fileServer := http.FileServer(http.Dir(argv.StaticPath))
|
fileServer := http.FileServer(http.Dir(argv.StaticPath))
|
||||||
mux.Handle("/static/", http.StripPrefix("/static/", CacheControlMiddleware(fileServer, 3600)))
|
mux.Handle("GET /static/", http.StripPrefix("/static/", CacheControlMiddleware(fileServer, 3600)))
|
||||||
|
|
||||||
makeRequestContext := func() *RequestContext {
|
makeRequestContext := func() *RequestContext {
|
||||||
return &RequestContext{
|
return &RequestContext{
|
||||||
|
|
Loading…
Reference in New Issue