summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.drone.yml49
-rw-r--r--api/serve.go2
2 files changed, 25 insertions, 26 deletions
diff --git a/.drone.yml b/.drone.yml
index dbfe6cf..8f459a1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,33 +1,32 @@
---
kind: pipeline
type: docker
-name: build and publish docker image
+name: build, publish docker image, deploy
steps:
- #- name: docker
- # image: plugins/docker
- # settings:
- # username:
- # from_secret: gitea_packpub_username
- # password:
- # from_secret: gitea_packpub_password
- # registry: git.hatecomputers.club
- # repo: git.hatecomputers.club/hatecomputers/hatecomputers.club
- # tags:
- # - latest
- # - main
-- name: ssh
- image: appleboy/drone-ssh
- settings:
- host: hatecomputers.club
- username: root
- key:
- from_secret: cd_ssh_key
- port: 22
- command_timeout: 2m
- script:
- - systemctl restart docker-compose@hatecomputers-club
-
+ - name: docker
+ image: plugins/docker
+ settings:
+ username:
+ from_secret: gitea_packpub_username
+ password:
+ from_secret: gitea_packpub_password
+ registry: git.hatecomputers.club
+ repo: git.hatecomputers.club/hatecomputers/hatecomputers.club
+ tags:
+ - latest
+ - main
+ - name: ssh
+ image: appleboy/drone-ssh
+ settings:
+ host: hatecomputers.club
+ username: root
+ key:
+ from_secret: cd_ssh_key
+ port: 22
+ command_timeout: 2m
+ script:
+ - systemctl restart docker-compose@hatecomputers-club
trigger:
branch:
- main
diff --git a/api/serve.go b/api/serve.go
index 2cddcfd..f71001d 100644
--- a/api/serve.go
+++ b/api/serve.go
@@ -78,7 +78,7 @@ func MakeServer(argv *args.Arguments, dbConn *sql.DB) *http.Server {
mux := http.NewServeMux()
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 {
return &RequestContext{