diff options
| author |  Sadie Powell | 2020-07-29 12:13:45 +0100 |
|---|---|---|
| committer | Sadie Powell | 2020-07-29 12:13:45 +0100 |
| commit | e059f822495b02f73f85a668c152c8233cb66f92 (patch) | |
| tree | 3fc144657d6843f6b07caec69839921bdc962663 /make | |
| parent | Add a method for creating a regex pattern with included flags. (diff) | |
| parent | Replace all erroneous space indentation with tab indentation. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'make')
| -rw-r--r-- | make/template/inspircd.service | 8 | ||||
| -rw-r--r-- | make/template/logrotate | 42 | ||||
| -rw-r--r-- | make/template/main.mk | 1 |
3 files changed, 46 insertions, 5 deletions
diff --git a/make/template/inspircd.service b/make/template/inspircd.service index 39c7d23e0..a389d488b 100644 --- a/make/template/inspircd.service +++ b/make/template/inspircd.service @@ -27,12 +27,10 @@ After=network-online.target Wants=network-online.target [Service] -ExecReload=@SCRIPT_DIR@/inspircd rehash -ExecStart=@SCRIPT_DIR@/inspircd start -ExecStop=@SCRIPT_DIR@/inspircd stop -PIDFile=@DATA_DIR@/inspircd.pid +ExecReload=/bin/kill -HUP $MAINPID +ExecStart=@BINARY_DIR@/inspircd --nofork --nopid Restart=on-failure -Type=forking +Type=simple User=@USER@ Group=@GROUP@ diff --git a/make/template/logrotate b/make/template/logrotate new file mode 100644 index 000000000..a80d2b5a3 --- /dev/null +++ b/make/template/logrotate @@ -0,0 +1,42 @@ +# +# InspIRCd -- Internet Relay Chat Daemon +# +# Copyright (C) 2020 Sadie Powell <sadie@witchery.services> +# +# This file is part of InspIRCd. InspIRCd is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, version 2. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +# To use this file move it to /etc/logrotate.d/inspircd + +@LOG_DIR@/* { + compress + create 0644 @USER@ @GROUP@ + dateext + delaycompress + missingok + notifempty + rotate 8 + weekly + postrotate + if [ -d /lib/systemd ] + then + if systemctl --quiet is-active inspircd + then + systemctl kill --signal HUP inspircd + fi + elif [ -x "@SCRIPT_DIR@/inspircd" ] + then + "@SCRIPT_DIR@/inspircd" rehash + fi + endscript +} diff --git a/make/template/main.mk b/make/template/main.mk index f28dc2919..1ee794afd 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -236,6 +236,7 @@ install: target -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null + -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null ifeq ($(SYSTEM), darwin) -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/org.inspircd.plist $(SCRPATH) 2>/dev/null endif |