diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2024-06-10 17:21:29 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2024-06-10 18:32:10 +0200 |
| commit | fa6d2fe4f8175b6db85186fb468955cbac9a820e (patch) | |
| tree | 17b1d6c44fab82b4454376aeeda8bbd63cf98b77 | |
| parent | ad77b5101ab196c71bd7907d1c71084a06ac7b64 (diff) | |
| download | etc_apache2-fa6d2fe4f8175b6db85186fb468955cbac9a820e.tar.gz etc_apache2-fa6d2fe4f8175b6db85186fb468955cbac9a820e.tar.bz2 etc_apache2-fa6d2fe4f8175b6db85186fb468955cbac9a820e.zip | |
Fix mumble.replicant.us.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | sites-available/mumble.replicant.us.conf | 9 |
2 files changed, 10 insertions, 9 deletions
@@ -63,7 +63,10 @@ apache2.tar.xz: apache2.tar install -o git -g git -m 755 -d /srv/git/git-data/repositories install -o git -g git -m 644 $^ $@ -EXTRA_ETC_CONFIG = \ +/var/www/mumble.replicant.us: + install -o root -g root -m 755 -d $@ + +EXTRA_CONFIG = \ /etc/cgit.d/contrib.conf \ /etc/cgit.d/infrastructure.conf \ /etc/cgit.d/mirrors.conf \ @@ -71,9 +74,10 @@ EXTRA_ETC_CONFIG = \ /etc/cgit.d/replicant-next.conf \ /etc/gitconfig \ /etc/gitolite3/gitolite.rc \ - /var/lib/gitolite3/repositories/restore-permissions.sh + /var/lib/gitolite3/repositories/restore-permissions.sh \ + /var/www/mumble.replicant.us -update: $(EXTRA_ETC_CONFIG) +update: $(EXTRA_CONFIG) id www-data | grep 'groups=.*(git)' || gpasswd -a www-data git git fetch $(REMOTE) git verify-commit $(REMOTE)/$(BRANCH) diff --git a/sites-available/mumble.replicant.us.conf b/sites-available/mumble.replicant.us.conf index fe04cba..79d0644 100644 --- a/sites-available/mumble.replicant.us.conf +++ b/sites-available/mumble.replicant.us.conf @@ -14,9 +14,6 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. <VirtualHost *:80> - ServerName mumble.replicant.us - RewriteEngine On - RewriteCond %{HTTPS} off - RewriteCond %{REMOTE_ADDR} !=127.0.0.1 - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} -</VirtualHost>
\ No newline at end of file + ServerName mumble.replicant.us + DocumentRoot /var/www/mumble.replicant.us +</VirtualHost> |