Unify docker image

This makes it easier to manage and unifies the services that essentially
belong together. Might consider making it a split configuration again
later, but for now it makes much more sense such that fail2ban can
better operate with all the available logs instead of managing the
circus that is docker volumes.

9 files changed, 0 insertions, 193 deletions

diff --git a/cgit/40-fcgiwrap.sh b/cgit/40-fcgiwrap.sh
deleted file mode 100644
index 3f788af..0000000
--- a/cgit/40-fcgiwrap.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -ex
-
-# start fastcgiwrap
-rm -f /run/fcgiwrap.socket
-nohup fcgiwrap -s unix:/run/fcgiwrap.socket &
-while ! [ -S /run/fcgiwrap.socket ]; do sleep .2; done
-chown nginx:www-data /run/fcgiwrap.socket
-#chmod g+rwx /run/fcgiwrap.socket
-#test -f nohup.out && rm -f ./nohup.out
diff --git a/cgit/Dockerfile b/cgit/Dockerfile
deleted file mode 100644
index 007fe23..0000000
--- a/cgit/Dockerfile
+++ /dev/null
@@ -1,50 +0,0 @@
-FROM nginx:1.29.7-alpine-slim AS build
-
-RUN set -x \
- && apk add --no-cache gcc make curl linux-headers musl-dev zlib-dev libressl-dev libintl musl-libintl
-
-RUN wget 'https://git.zx2c4.com/cgit/snapshot/cgit-1.3.tar.xz' \
- && tar -xvf cgit-1.3.tar.xz
-
-WORKDIR /cgit-1.3
-RUN make get-git \
- && DESTDIR=pkg NO_REGEX=NeedsStartEnd make install
-
-WORKDIR /cgit-1.3/pkg
-RUN tar -czvf cgit-1.3.tar.gz .
-
-
-FROM nginx:1.29.7-alpine-slim
-COPY --from=build /cgit-1.3/pkg/cgit-1.3.tar.gz /cgit-1.3.tar.gz
-
-ARG DOMAIN=localhost
-
-RUN set -x \
- && apk add --no-cache fcgiwrap envsubst \
- && tar -xvf /cgit-1.3.tar.gz
-
-RUN apk update && apk update
-
-COPY 40-fcgiwrap.sh /docker-entrypoint.d/
-RUN chmod +x /docker-entrypoint.d/40-fcgiwrap.sh
-
-COPY cgitrc /etc/
-
-COPY nginx.conf /
-RUN sed "s/\$DOMAIN/$DOMAIN/g" /nginx.conf > /etc/nginx/conf.d/default.conf
-RUN rm /nginx.conf
-
-RUN addgroup nginx www-data
-
-COPY about.html /var/www/htdocs/cgit/
-COPY cgit.png /var/www/htdocs/cgit/logo.png
-COPY favicon.ico /var/www/htdocs/cgit/
-
-COPY css_variable_colors.sh /
-COPY everforest.css /var/www/htdocs/cgit/
-RUN sh css_variable_colors.sh
-
-#RUN sed -i -Ee 's/pid\s+.*;/pid \/tmp\/nginx.pid;/' /etc/nginx/nginx.conf
-#RUN sed -i -Ee 's/error_log\s+.*;/error_log \/dev\/stdout;/' /etc/nginx/nginx.conf
-#
-#USER nginx
diff --git a/cgit/about.html b/cgit/about.html
deleted file mode 100644
index ede0cb5..0000000
--- a/cgit/about.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<h2>Disclaimer</h2>
-I request that none of this code, in part or in full, be hosted on Github,
-Sourceforge, or any other proprietary platform. This request is made out of
-respect for both me, the developer and for you, the user.
diff --git a/cgit/cgit.png b/cgit/cgit.png
deleted file mode 100644
index 65cb7da..0000000
--- a/cgit/cgit.png
+++ /dev/null
diff --git a/cgit/cgitrc b/cgit/cgitrc
deleted file mode 100644
index 6abeaf5..0000000
--- a/cgit/cgitrc
+++ /dev/null
@@ -1,28 +0,0 @@
-# Needed to avoid duplicating URI in every href
-virtual-root=/
-
-# Enable us "ignoring" specific repositories
-enable-git-config=1
-
-# Self explanatory
-enable-http-clone=1
-
-# Remove .git suffix
-remove-suffix=1
-
-# Needs to be mountpoint of the gitolite volume
-scan-path=/var/lib/git/repositories
-project-list=/var/lib/git/projects.list
-
-# Requires python
-#source-filter=/usr/lib/cgit/filters/syntax-high.py
-#about-filter=/usr/lib/cgit/filters/about-formatting.sh
-
-root-title=Personal projects
-root-desc=A brief collection
-root-readme=/var/www/htdocs/cgit/about.html
-local-time=1
-
-css=/everforest.css
-css=/cgit.css
-logo=/logo.png
diff --git a/cgit/css_variable_colors.sh b/cgit/css_variable_colors.sh
deleted file mode 100644
index 9ef2818..0000000
--- a/cgit/css_variable_colors.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-CGIT_CSS_PATH=/var/www/htdocs/cgit/cgit.css
-sed -i -Ee 's/\<white\>/var(--color-bg)/g' "${CGIT_CSS_PATH}"
-sed -i -Ee 's/\<blue\>/var(--color-accent)/g' "${CGIT_CSS_PATH}"
-sed -i -Ee 's/\<black\>/var(--color-fg)/g' "${CGIT_CSS_PATH}"
-sed -i -Ee 's/#333\>/var(--color-fg)/g' "${CGIT_CSS_PATH}"
-
-sed -i -Ee 's/#ccc\>/var(--color-white-dim)/g' "${CGIT_CSS_PATH}"
-sed -i -Ee 's/#000\>/var(--color-fg-bright)/g' "${CGIT_CSS_PATH}"
-
-sed -i -Ee 's/#777\>/var(--color-white-dim)/g' "${CGIT_CSS_PATH}"
-sed -i -Ee 's/#f7f7f7\>/var(--color-bg-bright)/g' "${CGIT_CSS_PATH}"
-
-sed -i -Ee 's/#eee\>/var(--color-black-bright)/g' "${CGIT_CSS_PATH}"
-
-# links
-sed -i -Ee 's/#00f\>/var(--color-accent)/g' "${CGIT_CSS_PATH}"
-
-# ago, minutes, hours
-sed -i -Ee 's/#080\>/var(--color-green)/g' "${CGIT_CSS_PATH}"
-# ago, days
-sed -i -Ee 's/#040\>/var(--color-green-bright)/g' "${CGIT_CSS_PATH}"
-# ago, weeks
-sed -i -Ee 's/#444\>/var(--color-yellow)/g' "${CGIT_CSS_PATH}"
-# ago, months
-sed -i -Ee 's/#888\>/var(--color-yellow-bright)/g' "${CGIT_CSS_PATH}"
-# ago, years
-sed -i -Ee 's/#bbb\>/var(--color-white)/g' "${CGIT_CSS_PATH}"
-
diff --git a/cgit/everforest.css b/cgit/everforest.css
deleted file mode 100644
index 60c64f3..0000000
--- a/cgit/everforest.css
+++ /dev/null
@@ -1,49 +0,0 @@
-:root {
-
-  /* Regular */
-  --color-black:            #1e2326;
-  --color-red:              #e67e80;
-  --color-green:            #a7c080;
-  --color-yellow:           #dbbc7f;
-  --color-blue:             #7fbbb3;
-  --color-purple:           #d699b6;
-  --color-turquoise:        #7fbbb3;
-  --color-white:            #d3c6aa;
-
-  /* Bright */
-  --color-black-bright:     #4f5b58;
-  --color-red-bright:       #e66868;
-  --color-green-bright:     #93b259;
-  --color-yellow-bright:    #dfa000;
-  --color-blue-bright:      #3a94c5;
-  --color-purple-bright:    #df69ba;
-  --color-turquoise-bright: #3a94c5;
-  --color-white-bright:     #ffffff;
-
-  --color-white-dim:        #7a8478;
-
-
-  --color-fg: #d3c6aa;
-  --color-bg: #3c4841; /*#272e33;*/
-  --color-fg-bright: #fff;
-  --color-bg-bright: #374145;
-  --color-fg-sel: #fff;
-  --color-bg-sel: #414b50;
-
-  --color-accent:      var(--color-green);
-  --color-header:      var(--color-accent);
-  --color-list-point:  var(--color-accent);
-
-  --color-var(--color-blue):
-}
-
-body {
-  background-color: var(--color-bg);
-  color: var(--color-fg);
-}
-
-div#cgit table.tabs td.form input,
-div#cgit table.tabs td.form select {
-  background-color: var(--color-bg-bright);
-  color: var(--color-fg-bright);
-}
diff --git a/cgit/favicon.png b/cgit/favicon.png
deleted file mode 100644
index da6269e..0000000
--- a/cgit/favicon.png
+++ /dev/null
diff --git a/cgit/nginx.conf b/cgit/nginx.conf
deleted file mode 100644
index 7b03929..0000000
--- a/cgit/nginx.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-server {
-    server_name $DOMAIN;
-
-    listen [::]:80;
-    listen 80;
-
-    access_log  /var/log/nginx/cgit-access.log;
-    error_log   /var/log/nginx/cgit-error.log;
-
-    root /var/www/htdocs/cgit;
-    try_files $uri @cgit;
-
-    location @cgit {
-        include          fastcgi_params;
-        fastcgi_param    SCRIPT_FILENAME /var/www/htdocs/cgit/cgit.cgi;
-        fastcgi_pass     unix:/run/fcgiwrap.socket;
-
-        fastcgi_param    PATH_INFO    $uri;
-        fastcgi_param    QUERY_STRING $args;
-        fastcgi_param    HTTP_HOST    $server_name;
-    }
-}