diff --git a/common/envs b/common/envs index d3d3272..2c2e3b3 100644 --- a/common/envs +++ b/common/envs @@ -23,4 +23,4 @@ host/laptop/postmates-macbook host/laptop/uber-macbook host/laptop/val-macbook host/layer/personal -host/layer/nginx-user-public +host/layer/public-webserver diff --git a/host/layer/public-webserver/Caddyfile b/host/layer/public-webserver/Caddyfile deleted file mode 100644 index b287e56..0000000 --- a/host/layer/public-webserver/Caddyfile +++ /dev/null @@ -1,8 +0,0 @@ -{ - admin "unix//run/caddy/admin.socket" -} - -{system.hostname} { - root * /usr/share/caddy - file_server browse -} diff --git a/host/layer/public-webserver/caddy/Caddyfile b/host/layer/public-webserver/caddy/Caddyfile new file mode 100755 index 0000000..b924229 --- /dev/null +++ b/host/layer/public-webserver/caddy/Caddyfile @@ -0,0 +1,11 @@ +{ + admin "unix//run/caddy/admin.socket" +} + +// http://127.0.0.1 http://0.0.0.0 http://{system.hostname} { + root * /srv/http + file_server { + browse /etc/caddy/browse_template.html + hide \.* + } +} diff --git a/host/layer/public-webserver/caddy/browse_template.html b/host/layer/public-webserver/caddy/browse_template.html new file mode 100644 index 0000000..c07ea60 --- /dev/null +++ b/host/layer/public-webserver/caddy/browse_template.html @@ -0,0 +1,190 @@ + + + + {{html .Name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ {{range $i, $crumb := .Breadcrumbs}}{{html $crumb.Text}}{{if ne $i 0}}/{{end}}{{end}} +
+
+
+
+
+ + {{.NumDirs}} director{{if eq 1 .NumDirs}}y{{else}}ies{{end}} + {{.NumFiles}} file{{if ne 1 .NumFiles}}s{{end}} + {{- if ne 0 .Limit}} + (of which only {{.Limit}} are displayed) + {{- end}} +
+
+
+ + + + + + + + + + + + {{- range .Items}} + + + + {{- if .IsDir}} + + {{- else}} + + {{- end}} + + + + {{- end}} + +
+ {{- if and (eq .Sort "namedirfirst") (ne .Order "desc")}} + + {{- else if and (eq .Sort "namedirfirst") (ne .Order "asc")}} + + {{- else}} + + {{- end}} + + {{- if and (eq .Sort "name") (ne .Order "desc")}} + Name + {{- else if and (eq .Sort "name") (ne .Order "asc")}} + Name + {{- else}} + Name + {{- end}} + + {{- if and (eq .Sort "size") (ne .Order "desc")}} + Size + {{- else if and (eq .Sort "size") (ne .Order "asc")}} + Size + {{- else}} + Size + {{- end}} + + {{- if and (eq .Sort "time") (ne .Order "desc")}} + Modified + {{- else if and (eq .Sort "time") (ne .Order "asc")}} + Modified + {{- else}} + Modified + {{- end}} +
+ + {{- if .IsDir -}} + + {{- else -}} + + {{- end -}} + {{html .Name}} + + —{{.HumanSize}}
+
+
+ + + diff --git a/host/layer/public-webserver/dotfiles-setup.d.fish b/host/layer/public-webserver/dotfiles-setup.d.fish index 0be7c2a..1b79105 100644 --- a/host/layer/public-webserver/dotfiles-setup.d.fish +++ b/host/layer/public-webserver/dotfiles-setup.d.fish @@ -6,12 +6,13 @@ set homedir $argv[2] set xdgconfdir $argv[3] set layerdir (pwd) -function _ln +function _p set source $argv[1] set dest $argv[2] - sudo rm -f "$dest" + sudo rm -rf "$dest" echo "Copying $source to $dest" - sudo ln -s "$source" "$dest" + sudo cp -r "$source" "$dest" end -_ln $layerdir/Caddyfile /etc/caddy/Caddyfile +_p $layerdir/caddy /etc/caddy +_p $layerdir/webserver-root /srv/http diff --git a/host/layer/public-webserver/webserver-root/index.html b/host/layer/public-webserver/webserver-root/index.html new file mode 100644 index 0000000..e7efd73 --- /dev/null +++ b/host/layer/public-webserver/webserver-root/index.html @@ -0,0 +1,6 @@ + + Public Web lyte.dev Machine + + + Public Files + \ No newline at end of file diff --git a/host/layer/public-webserver/webserver-root/public-files/.gitignore b/host/layer/public-webserver/webserver-root/public-files/.gitignore new file mode 100644 index 0000000..3aac695 --- /dev/null +++ b/host/layer/public-webserver/webserver-root/public-files/.gitignore @@ -0,0 +1,3 @@ +* +.* +!.gitignore