Skip to content

Fix user conf #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
john-david3 merged 9 commits into from
Mar 25, 2026
Merged

Fix user conf #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3576c21
Remove localhost
john-david3 Mar 8, 2026
1ac577f
Correct the Port
john-david3 Mar 8, 2026
91b3041
Fix static routes
john-david3 Mar 8, 2026
58538f3
Fix new paths not loading
john-david3 Mar 10, 2026
7109280
Remove cleaning database on startup
john-david3 Mar 10, 2026
ca55b55
Refactor atomic writes
john-david3 Mar 10, 2026
83c8992
merge main
john-david3 Mar 11, 2026
c15fb17
Merge branch 'main' into aws-branch
john-david3 Mar 25, 2026
5422e4e
Fix NGINX Template not working per-user
john-david3 Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dataplane/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func handleNewConfig(w http.ResponseWriter, r *http.Request) {
}

func applyNginxConfig() error {
slog.Info("reloading nginx config")
cmd := exec.Command("nginx", "-t")

output, err := cmd.CombinedOutput()
Expand Down
2 changes: 1 addition & 1 deletion src/templates/nginx.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ limit_req_zone $binary_remote_addr zone={{ $.Username }}_{{ .ZoneName }}:{{ .Rat
{{/* Server blocks */}}
server {
listen 8080;
server_name _;
server_name {{ .Username }};

access_log /var/log/nginx/users/{{ .Username }}/access.log;
error_log /var/log/nginx/users/{{ .Username }}/error.log;
Expand Down
2 changes: 1 addition & 1 deletion src/watcher/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func Watch() {
}

confPath := filepath.Join(event.Name, "nginx.conf")
if _, err := os.Stat(confPath); err == nil {
if _, err = os.Stat(confPath); err == nil {
sendNginxToDataplane(confPath)
}
continue
Expand Down
Loading