Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
caddyproxy
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
caddyproxy
Commits
992ea229
Commit
992ea229
authored
Oct 07, 2024
by
vicotor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add tls
parent
6ca129da
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
39 deletions
+50
-39
caddyapi.go
caddy/caddyapi.go
+16
-13
template.go
caddy/template.go
+2
-0
type.go
caddy/type.go
+6
-4
params.go
command/run/params.go
+21
-18
run.go
command/run/run.go
+1
-1
config.go
openapi/config.go
+4
-3
No files found.
caddy/caddyapi.go
View file @
992ea229
...
...
@@ -17,11 +17,12 @@ import (
type
CaddyAPI
struct
{
Url
string
// URL of the Caddy API
RootDir
string
// Root directory of the Caddy to store website files and .caddy files.
MasterDomain
string
client
*
http
.
Client
}
func
NewCaddyAPI
(
url
string
,
root
string
)
*
CaddyAPI
{
return
&
CaddyAPI
{
Url
:
url
,
RootDir
:
root
,
client
:
&
http
.
Client
{}}
func
NewCaddyAPI
(
url
string
,
root
string
,
master
string
)
*
CaddyAPI
{
return
&
CaddyAPI
{
Url
:
url
,
RootDir
:
root
,
client
:
&
http
.
Client
{}
,
MasterDomain
:
master
}
}
func
(
c
*
CaddyAPI
)
buildPayloadForCreateWebsite
(
domain
string
,
root
string
)
(
string
,
error
)
{
...
...
@@ -45,13 +46,14 @@ func (c *CaddyAPI) buildPayloadForCreateWebsite(domain string, root string) (str
return
buffer
.
String
(),
nil
}
func
(
c
*
CaddyAPI
)
newWebsiteCaddyFile
(
domain
string
,
root
string
)
error
{
func
(
c
*
CaddyAPI
)
newWebsiteCaddyFile
(
domain
string
,
root
string
,
master
string
)
error
{
buffer
:=
bytes
.
NewBufferString
(
""
)
caddypath
:=
filepath
.
Join
(
c
.
RootDir
,
fmt
.
Sprintf
(
"%s.caddy"
,
domain
))
// build CaddyFileTemplate.
cfg
:=
NewWebsiteCaddyFile
{
DomainName
:
fmt
.
Sprintf
(
"https://%s"
,
domain
),
RootDir
:
root
,
MasterDomain
:
master
,
}
tmpl
,
err
:=
template
.
New
(
"test"
)
.
Parse
(
staticWebsiteCaddyFileTempl
)
if
err
!=
nil
{
...
...
@@ -71,13 +73,14 @@ func (c *CaddyAPI) newWebsiteCaddyFile(domain string, root string) error {
return
nil
}
func
(
c
*
CaddyAPI
)
newForwardCaddyFile
(
from
string
,
to
string
)
error
{
func
(
c
*
CaddyAPI
)
newForwardCaddyFile
(
from
string
,
to
string
,
master
string
)
error
{
buffer
:=
bytes
.
NewBufferString
(
""
)
caddypath
:=
filepath
.
Join
(
c
.
RootDir
,
fmt
.
Sprintf
(
"%s.caddy"
,
from
))
// build CaddyFileTemplate.
cfg
:=
ForwardWebsiteCaddyFile
{
DomainName
:
fmt
.
Sprintf
(
"https://%s"
,
from
),
Target
:
to
,
MasterDomain
:
master
,
}
tmpl
,
err
:=
template
.
New
(
"test"
)
.
Parse
(
forwardWebsiteCaddyFileTempl
)
if
err
!=
nil
{
...
...
@@ -159,7 +162,7 @@ func (c *CaddyAPI) CreateWebsite(domain string, resource string) error {
return
err
}
// create caddyfile.
if
err
:=
c
.
newWebsiteCaddyFile
(
domain
,
websiteRoot
);
err
!=
nil
{
if
err
:=
c
.
newWebsiteCaddyFile
(
domain
,
websiteRoot
,
c
.
MasterDomain
);
err
!=
nil
{
return
err
}
...
...
@@ -181,7 +184,7 @@ func (c *CaddyAPI) CreateWebsite(domain string, resource string) error {
func
(
c
*
CaddyAPI
)
ForwardWebsite
(
param
types
.
ForwardWebsite
)
error
{
// create caddyfile.
if
err
:=
c
.
newForwardCaddyFile
(
param
.
Domain
,
param
.
Target
);
err
!=
nil
{
if
err
:=
c
.
newForwardCaddyFile
(
param
.
Domain
,
param
.
Target
,
c
.
MasterDomain
);
err
!=
nil
{
return
err
}
...
...
caddy/template.go
View file @
992ea229
...
...
@@ -2,6 +2,7 @@ package caddy
var
staticWebsiteCaddyFileTempl
=
`
{{ .DomainName }} {
tls /certs/{{ .MasterDomain }}/{{ .MasterDomain }}.crt /certs/{{ .MasterDomain }}/{{ .MasterDomain }}.key
root * {{ .RootDir }}
file_server
...
...
@@ -11,6 +12,7 @@ var staticWebsiteCaddyFileTempl = `
var
forwardWebsiteCaddyFileTempl
=
`
{{ .DomainName }} {
tls /certs/{{ .MasterDomain }}/{{ .MasterDomain }}.crt /certs/{{ .MasterDomain }}/{{ .MasterDomain }}.key
reverse_proxy https://{{ .Target }} {
header_up Host {upstream_hostport}
transport http {
...
...
caddy/type.go
View file @
992ea229
...
...
@@ -3,6 +3,7 @@ package caddy
type
NewWebsiteCaddyFile
struct
{
DomainName
string
RootDir
string
MasterDomain
string
}
type
StaticWebsiteCreatePayload
struct
{
...
...
@@ -14,6 +15,7 @@ type StaticWebsiteCreatePayload struct {
type
ForwardWebsiteCaddyFile
struct
{
DomainName
string
Target
string
MasterDomain
string
}
type
ForwardWebsitePayload
struct
{
...
...
command/run/params.go
View file @
992ea229
...
...
@@ -6,6 +6,7 @@ const (
caddyUrlFlag
=
"caddy-url"
caddyRootFlag
=
"caddy-root"
downloadDirFlag
=
"download-dir"
masterDomainFlag
=
"master-domain"
logFlag
=
"log"
)
...
...
@@ -16,6 +17,7 @@ type serviceParam struct {
caddyRoot
string
logPath
string
downloadDir
string
masterDomain
string
}
var
(
...
...
@@ -26,5 +28,6 @@ var (
caddyRoot
:
""
,
logPath
:
"/root/data/service.log"
,
downloadDir
:
"/root/data/download"
,
masterDomain
:
""
,
}
)
command/run/run.go
View file @
992ea229
...
...
@@ -92,7 +92,7 @@ func runCommand(cmd *cobra.Command, _ []string) {
}
}()
capi
:=
caddy
.
NewCaddyAPI
(
params
.
caddyUrl
,
params
.
caddyRoot
)
capi
:=
caddy
.
NewCaddyAPI
(
params
.
caddyUrl
,
params
.
caddyRoot
,
params
.
masterDomain
)
api
:=
openapi
.
NewOpenAPI
(
&
openapi
.
Config
{
Host
:
params
.
host
,
...
...
openapi/config.go
View file @
992ea229
...
...
@@ -4,4 +4,5 @@ type Config struct {
Host
string
Port
int
TempDir
string
// temp dir store download files.
MasterDomain
string
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment