diff options
| -rw-r--r-- | .bashrc | 18 | ||||
| -rw-r--r-- | ops/.gitignore | 1 | ||||
| -rw-r--r-- | ops/bashrc.d/00-env.sh | 5 | ||||
| -rw-r--r-- | ops/bashrc.d/01-alias.sh | 2 | ||||
| -rwxr-xr-x | ops/bashrc.d/10-docker.sh | 6 | ||||
| -rw-r--r-- | ops/bashrc.d/11-proxy.sh | 6 | ||||
| -rw-r--r-- | ops/install.sh | 2 | ||||
| -rw-r--r-- | stacks/cgit/.env.template | 1 | ||||
| -rw-r--r-- | stacks/cgit/compose.yml | 4 | ||||
| -rw-r--r-- | stacks/edge/compose.yml | 3 |
10 files changed, 5 insertions, 43 deletions
diff --git a/.bashrc b/.bashrc deleted file mode 100644 index 06c3009..0000000 --- a/.bashrc +++ /dev/null @@ -1,18 +0,0 @@ -# .bashrc -# Source global definitions -[ -f /etc/bashrc ] && . /etc/bashrc - -# User-specific PATH -case ":$PATH:" in - *":$HOME/.local/bin:"*|*":$HOME/bin:"*) ;; - *) PATH="$HOME/.local/bin:$HOME/bin:$PATH" ;; -esac -export PATH - -# Load modular bash configs -if [ -d "$HOME/.bashrc.d" ]; then - for rc in "$HOME/.bashrc.d"/*.bashrc; do - [ -f "$rc" ] && . "$rc" - done -fi -unset rc diff --git a/ops/.gitignore b/ops/.gitignore deleted file mode 100644 index 838478f..0000000 --- a/ops/.gitignore +++ /dev/null @@ -1 +0,0 @@ -bashrc.d/secrets.sh
\ No newline at end of file diff --git a/ops/bashrc.d/00-env.sh b/ops/bashrc.d/00-env.sh deleted file mode 100644 index 59de281..0000000 --- a/ops/bashrc.d/00-env.sh +++ /dev/null @@ -1,5 +0,0 @@ -# Environment Variables -BASHCONF=$HOME/.bashrc -RDNBASHCONF=$HOME/.bashrc.d/rdn.bashrc -RDNHTTPCONF=$HOME/rdn/http/conf/Caddyfile -RDNHTTPCOMP=$HOME/rdn/http/compose.yml diff --git a/ops/bashrc.d/01-alias.sh b/ops/bashrc.d/01-alias.sh deleted file mode 100644 index acea538..0000000 --- a/ops/bashrc.d/01-alias.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Server -alias src='source $BASHCONF' diff --git a/ops/bashrc.d/10-docker.sh b/ops/bashrc.d/10-docker.sh deleted file mode 100755 index 374a283..0000000 --- a/ops/bashrc.d/10-docker.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Docker -alias dcycle='docker compose down && docker compose up -d' -alias ddrop='docker compose down' -alias dlift='docker compose up -d' -alias dlogs='docker compose logs' -alias dps='docker ps' diff --git a/ops/bashrc.d/11-proxy.sh b/ops/bashrc.d/11-proxy.sh deleted file mode 100644 index 7b2a9ff..0000000 --- a/ops/bashrc.d/11-proxy.sh +++ /dev/null @@ -1,6 +0,0 @@ -# HTTP Server -alias htcycle='docker compose -f $RDNHTTPCOMP down && docker compose -f $RDNHTTPCOMP up -d' -alias htdrop='docker compose -f $RDNHTTPCOMP down' -alias htlift='docker compose -f $RDNHTTPCOMP up -d' -alias htlogs='docker compose -f $RDNHTTPCOMP logs' -alias htconf='vim $RDNHTTPCONF' diff --git a/ops/install.sh b/ops/install.sh deleted file mode 100644 index f28254f..0000000 --- a/ops/install.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -## TODO: Bootstrap to respective locations. diff --git a/stacks/cgit/.env.template b/stacks/cgit/.env.template index 94ec0ed..663c8c5 100644 --- a/stacks/cgit/.env.template +++ b/stacks/cgit/.env.template @@ -14,3 +14,4 @@ _NET= _CSS_FILE= _CONFIG_FILE= _GIT_ROOT= +_IMPORTS= diff --git a/stacks/cgit/compose.yml b/stacks/cgit/compose.yml index e3c7ab1..cf21261 100644 --- a/stacks/cgit/compose.yml +++ b/stacks/cgit/compose.yml @@ -19,8 +19,6 @@ services: volumes: # TODO: Make these cgit-docker builtins. - ${_CSS_FILE:-./opt/cgit.css}:/srv/www/htdocs/cgit/cgit.css - - ${_SITE_HEADER:-./opt/header.html}:/opt/header.html - - ${_SITE_FOOTER:-./opt/footer.html}:/opt/footer.html - - ${_ROOT_README:-./opt/README.txt}:/opt/README.txt - ${_CONFIG_FILE:-./etc/cgitrc}:/etc/cgitrc + - ${_IMPORTS:-./opt/}:/opt - ${_GIT_ROOT:-./srv/git/}:/srv/git # mount the directory you use for your git server diff --git a/stacks/edge/compose.yml b/stacks/edge/compose.yml index 75baf0d..a1e71f4 100644 --- a/stacks/edge/compose.yml +++ b/stacks/edge/compose.yml @@ -23,6 +23,8 @@ services: - .env networks: - net + cap_add: + - NET_ADMIN # Allow Caddy to redefine memory limits based on host. ports: - 80:80 - 443:443 @@ -32,3 +34,4 @@ services: - ${_WEBROOT:-.srv/}:/srv - data:/data - config:/config + - /var/log/http/:/var/log/http # Bind for f2b. |
