From a1b8bfca7fd852433cec438b1c98dc24cd86b506 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Thu, 9 Jun 2022 22:22:54 -0500 Subject: Move my configured makefile stuff to cgit.conf I was thinking about keeping cgit.conf ignored and just putting everything in master, but remembered that I have a bunch of other files in this configured branch that need to stay too. So I've un-ignored cgit.conf to keep my changes, but moved the customizations over there for easier editing. --- .gitignore | 2 +- Makefile | 18 ------------------ cgit.conf | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 cgit.conf diff --git a/.gitignore b/.gitignore index 661df34..3d7801c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Files I don't care to see in git-status/commit /cgit -cgit.conf +#cgit.conf CGIT-CFLAGS VERSION cgitrc.5 diff --git a/Makefile b/Makefile index 6d9eda9..5967a32 100644 --- a/Makefile +++ b/Makefile @@ -92,24 +92,6 @@ install: all $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) $(COPYTREE) filters/* $(DESTDIR)$(filterdir) -SERVER = root@hetzner -SERVER_ROOT_DIR = /usr/local/cgit -SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR) -RSYNC = rsync -auvz -STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico - -server-install: all - $(RSYNC) cgit $(SERVER_ROOT)/bin/cgit.cgi - $(RSYNC) $(STATIC_ASSETS) $(SERVER_ROOT)/share/ - $(RSYNC) cgitrc $(SERVER):/etc/ - $(RSYNC) cgit-about-filter.sh $(SERVER):/usr/bin/ - ssh root@hetzner \ - chown root:root \ - $(SERVER_ROOT_DIR)/bin/cgit.cgi \ - $(SERVER_ROOT_DIR)/share/* \ - /etc/cgitrc \ - /usr/bin/cgit-about-filter.sh - install-doc: install-man install-html install-pdf install-man: doc-man diff --git a/cgit.conf b/cgit.conf new file mode 100644 index 0000000..fa28168 --- /dev/null +++ b/cgit.conf @@ -0,0 +1,18 @@ +# -*- makefile -*- +SERVER = root@hetzner +SERVER_ROOT_DIR = /usr/local/cgit +SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR) +RSYNC = rsync -auvz +STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico footer.txt + +server-install: all + $(RSYNC) cgit $(SERVER_ROOT)/bin/cgit.cgi + $(RSYNC) $(STATIC_ASSETS) $(SERVER_ROOT)/share/ + $(RSYNC) cgitrc $(SERVER):/etc/ + $(RSYNC) cgit-about-filter.sh $(SERVER):/usr/bin/ + ssh root@hetzner \ + chown root:root \ + $(SERVER_ROOT_DIR)/bin/cgit.cgi \ + $(SERVER_ROOT_DIR)/share/* \ + /etc/cgitrc \ + /usr/bin/cgit-about-filter.sh -- cgit 1.4.1-21-gabe81