From ba4da49423faaf49500f1b3366909e404f7862ff Mon Sep 17 00:00:00 2001 From: Malfurious Date: Fri, 15 Sep 2023 13:03:34 -0400 Subject: cgit: Consolidate config files into a single directory Continue cleaning the folder structure from the previous merge. Signed-off-by: Malfurious --- docker/.gitignore | 1 - docker/cgitrc | 38 -------------------------------------- docker/httpd.conf | 35 ----------------------------------- 3 files changed, 74 deletions(-) delete mode 100644 docker/.gitignore delete mode 100644 docker/cgitrc delete mode 100644 docker/httpd.conf (limited to 'docker') diff --git a/docker/.gitignore b/docker/.gitignore deleted file mode 100644 index 2fa7496..0000000 --- a/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.pub diff --git a/docker/cgitrc b/docker/cgitrc deleted file mode 100644 index 6df01d2..0000000 --- a/docker/cgitrc +++ /dev/null @@ -1,38 +0,0 @@ -# cgit config -# see cgitrc(5) for details -# -# possible todos: header, footer - -css=/cgit.css -logo=/cgit.png -logo-link=/ - -root-title=NormalMode.org Repositories -root-desc=Public repositories hosted on normalmode.org - -clone-url=https://$HTTP_HOST$SCRIPT_NAME/$CGIT_REPO_URL ssh://gitolite@$HTTP_HOST/$CGIT_REPO_URL - -enable-blame=1 -enable-follow-links=1 -enable-git-config=1 -enable-http-clone=1 -enable-index-links=1 -enable-index-owner=1 -enable-log-filecount=1 -enable-log-linecount=1 -enable-tree-linenumbers=1 - -section-sort=1 -repository-sort=age -branch-sort=age -agefile=agefile - -max-repo-count=512 -max-stats=year - -snapshots=tar.gz zip -remove-suffix=1 -section-from-path=-1 -strict-export=gl-creator - -scan-path=/data/repositories/ diff --git a/docker/httpd.conf b/docker/httpd.conf deleted file mode 100644 index 50f88aa..0000000 --- a/docker/httpd.conf +++ /dev/null @@ -1,35 +0,0 @@ -# https://httpd.apache.org/docs/current/ -# https://httpd.apache.org/docs/current/mod/directives.html - -LoadModule alias_module modules/mod_alias.so -LoadModule authz_core_module modules/mod_authz_core.so -LoadModule cgid_module modules/mod_cgid.so -LoadModule mpm_event_module modules/mod_mpm_event.so -LoadModule unixd_module modules/mod_unixd.so - -ServerRoot "/etc/httpd" -ServerAdmin webmaster@example.com -ServerName localhost -Listen 80 -User http -Group http - -ErrorLog "/var/log/httpd/error_log" -LogLevel warn - - - AllowOverride None - Require all denied - - - - AllowOverride None - Options ExecCGI FollowSymlinks - Require all granted - - -Alias /cgit.css "/usr/share/webapps/cgit/cgit.css" -Alias /cgit.png "/usr/share/webapps/cgit/cgit.png" -Alias /favicon.ico "/usr/share/webapps/cgit/favicon.ico" - -ScriptAlias / "/usr/share/webapps/cgit/cgit.cgi/" -- cgit v1.2.3 From 2ec1cd2ef77ef5b725c5db2755806459e19cec11 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Sat, 16 Sep 2023 06:06:37 -0400 Subject: cgit: Port Dockerfile for alpine base Move the cgit image off of archlinux for the same reasons as gitolite. However, in this case, debian isn't necessary, and going with alpine will give even smaller images. As is, it seems simpler to port the config files over to alpine anyway. See 90858ead45f6 for more context. Signed-off-by: Malfurious --- docker/Dockerfile.cgit | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 docker/Dockerfile.cgit (limited to 'docker') diff --git a/docker/Dockerfile.cgit b/docker/Dockerfile.cgit deleted file mode 100644 index 768a53d..0000000 --- a/docker/Dockerfile.cgit +++ /dev/null @@ -1,16 +0,0 @@ -# https://git.zx2c4.com/cgit/ -# https://wiki.archlinux.org/title/Cgit - -FROM archlinux - -# Install cgit and webserver -RUN pacman-key --init -RUN pacman -Syu --needed --noconfirm apache cgit - -# Copy configuration files -# Back-end datastore is expected to be mounted to /data (read-only) -COPY httpd.conf /etc/httpd/conf/httpd.conf -COPY cgitrc /etc/cgitrc - -EXPOSE 80 -CMD ["/usr/bin/httpd", "-DFOREGROUND"] -- cgit v1.2.3