about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2022-06-09 22:22:54 -0500
committerCase Duckworth2022-06-09 22:22:54 -0500
commita1b8bfca7fd852433cec438b1c98dc24cd86b506 (patch)
tree677b50a51dddd8061291aa379e6016faed947957
parentMerge branch 'master' into configured (diff)
downloadcgit-a1b8bfca7fd852433cec438b1c98dc24cd86b506.tar.gz
cgit-a1b8bfca7fd852433cec438b1c98dc24cd86b506.zip
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.
-rw-r--r--.gitignore2
-rw-r--r--Makefile18
-rw-r--r--cgit.conf18
3 files changed, 19 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 661df34..3d7801c 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,6 +1,6 @@
1# Files I don't care to see in git-status/commit 1# Files I don't care to see in git-status/commit
2/cgit 2/cgit
3cgit.conf 3#cgit.conf
4CGIT-CFLAGS 4CGIT-CFLAGS
5VERSION 5VERSION
6cgitrc.5 6cgitrc.5
diff --git a/Makefile b/Makefile index 6d9eda9..5967a32 100644 --- a/Makefile +++ b/Makefile
@@ -92,24 +92,6 @@ install: all
92 $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir) 92 $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
93 $(COPYTREE) filters/* $(DESTDIR)$(filterdir) 93 $(COPYTREE) filters/* $(DESTDIR)$(filterdir)
94 94
95SERVER = root@hetzner
96SERVER_ROOT_DIR = /usr/local/cgit
97SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR)
98RSYNC = rsync -auvz
99STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico
100
101server-install: all
102 $(RSYNC) cgit $(SERVER_ROOT)/bin/cgit.cgi
103 $(RSYNC) $(STATIC_ASSETS) $(SERVER_ROOT)/share/
104 $(RSYNC) cgitrc $(SERVER):/etc/
105 $(RSYNC) cgit-about-filter.sh $(SERVER):/usr/bin/
106 ssh root@hetzner \
107 chown root:root \
108 $(SERVER_ROOT_DIR)/bin/cgit.cgi \
109 $(SERVER_ROOT_DIR)/share/* \
110 /etc/cgitrc \
111 /usr/bin/cgit-about-filter.sh
112
113install-doc: install-man install-html install-pdf 95install-doc: install-man install-html install-pdf
114 96
115install-man: doc-man 97install-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 @@
1# -*- makefile -*-
2SERVER = root@hetzner
3SERVER_ROOT_DIR = /usr/local/cgit
4SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR)
5RSYNC = rsync -auvz
6STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico footer.txt
7
8server-install: all
9 $(RSYNC) cgit $(SERVER_ROOT)/bin/cgit.cgi
10 $(RSYNC) $(STATIC_ASSETS) $(SERVER_ROOT)/share/
11 $(RSYNC) cgitrc $(SERVER):/etc/
12 $(RSYNC) cgit-about-filter.sh $(SERVER):/usr/bin/
13 ssh root@hetzner \
14 chown root:root \
15 $(SERVER_ROOT_DIR)/bin/cgit.cgi \
16 $(SERVER_ROOT_DIR)/share/* \
17 /etc/cgitrc \
18 /usr/bin/cgit-about-filter.sh