Move basic auth from faaso-daemon to caddy
This commit is contained in:
parent
29d3c399ac
commit
ff454de0fd
25
Caddyfile
25
Caddyfile
@ -1,14 +1,19 @@
|
||||
{
|
||||
http_port 8888
|
||||
https_port 8887
|
||||
local_certs
|
||||
http_port 8888
|
||||
https_port 8887
|
||||
local_certs
|
||||
}
|
||||
|
||||
http://mindy:8888 {
|
||||
handle_path /admin/terminal/* {
|
||||
reverse_proxy /* http://127.0.0.1:7681
|
||||
}
|
||||
handle_path /admin/* {
|
||||
reverse_proxy /* http://127.0.0.1:3000
|
||||
}
|
||||
http://*:8888 {
|
||||
basicauth /admin/* {
|
||||
# admin $2a$14$C35905PxPzICAZKc/O9jYOS7ipZNPBtrndja8Yu3bvs/UujckryHS
|
||||
admin {$HTTP_BASIC_AUTH_PASSWORD}
|
||||
}
|
||||
|
||||
handle_path /admin/terminal/* {
|
||||
reverse_proxy /* http://127.0.0.1:7681
|
||||
}
|
||||
handle_path /admin/* {
|
||||
reverse_proxy /* http://127.0.0.1:3000
|
||||
}
|
||||
}
|
||||
|
2
Makefile
2
Makefile
@ -3,7 +3,7 @@ build: shard.yml $(wildcard src/**/*cr)
|
||||
proxy: build
|
||||
docker build . -t faaso-proxy
|
||||
start-proxy:
|
||||
docker run --name faaso-proxy-one --rm --network=faaso-net -v /var/run/docker.sock:/var/run/docker.sock -v secrets:/home/app/secrets -p 8888:8888 faaso-proxy
|
||||
docker run --name faaso-proxy-one --rm --network=faaso-net --env-file=proxy.env -v /var/run/docker.sock:/var/run/docker.sock -v secrets:/home/app/secrets -p 8888:8888 faaso-proxy
|
||||
|
||||
|
||||
.PHONY: build proxy-image start-proxy
|
||||
|
1
proxy.env
Normal file
1
proxy.env
Normal file
@ -0,0 +1 @@
|
||||
HTTP_BASIC_AUTH_PASSWORD=$2a$14$C35905PxPzICAZKc/O9jYOS7ipZNPBtrndja8Yu3bvs/UujckryHS
|
@ -28,5 +28,3 @@ dependencies:
|
||||
branch: add_exposed_ports
|
||||
kemal:
|
||||
github: kemalcr/kemal
|
||||
kemal-basic-auth:
|
||||
github: kemalcr/kemal-basic-auth
|
||||
|
@ -5,13 +5,9 @@ require "./terminal.cr"
|
||||
require "compress/gzip"
|
||||
require "crystar"
|
||||
require "docr"
|
||||
require "kemal-basic-auth"
|
||||
require "kemal"
|
||||
require "uuid"
|
||||
|
||||
# FIXME: make configurable
|
||||
basic_auth "admin", "admin"
|
||||
|
||||
get "/" do |env|
|
||||
env.redirect "/index.html"
|
||||
end
|
||||
|
@ -28,7 +28,11 @@ module Proxy
|
||||
local_certs
|
||||
}
|
||||
|
||||
http://mindy:8888 {
|
||||
http://*:8888 {
|
||||
basicauth /admin/* {
|
||||
admin {$HTTP_BASIC_AUTH_PASSWORD}
|
||||
}
|
||||
|
||||
handle_path /admin/terminal/* {
|
||||
reverse_proxy /* http://127.0.0.1:7681
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user