diff options
author | Case Duckworth | 2022-06-09 22:22:54 -0500 |
---|---|---|
committer | Case Duckworth | 2022-06-09 22:22:54 -0500 |
commit | a1b8bfca7fd852433cec438b1c98dc24cd86b506 (patch) | |
tree | 677b50a51dddd8061291aa379e6016faed947957 | |
parent | Merge branch 'master' into configured (diff) | |
download | cgit-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-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile | 18 | ||||
-rw-r--r-- | cgit.conf | 18 |
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 |
3 | cgit.conf | 3 | #cgit.conf |
4 | CGIT-CFLAGS | 4 | CGIT-CFLAGS |
5 | VERSION | 5 | VERSION |
6 | cgitrc.5 | 6 | cgitrc.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 | ||
95 | SERVER = root@hetzner | ||
96 | SERVER_ROOT_DIR = /usr/local/cgit | ||
97 | SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR) | ||
98 | RSYNC = rsync -auvz | ||
99 | STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico | ||
100 | |||
101 | server-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 | |||
113 | install-doc: install-man install-html install-pdf | 95 | install-doc: install-man install-html install-pdf |
114 | 96 | ||
115 | install-man: doc-man | 97 | 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 @@ | |||
1 | # -*- makefile -*- | ||
2 | SERVER = root@hetzner | ||
3 | SERVER_ROOT_DIR = /usr/local/cgit | ||
4 | SERVER_ROOT = $(SERVER):$(SERVER_ROOT_DIR) | ||
5 | RSYNC = rsync -auvz | ||
6 | STATIC_ASSETS = cgit.css cgit.png robots.txt avatar.png favicon.ico footer.txt | ||
7 | |||
8 | server-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 | ||