use journal namespace
This commit is contained in:
1 parent
ae4299a570
commit
4f0886b6cd
11 files changed
+201
-21
No files matched your search
@@ -43,7 +43,7 @@ check:
|
||||
install:
|
||||
install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(UNITDIR) $(DESTDIR)$(SYSUSERSDIR) \
|
||||
$(DESTDIR)$(TMPFILESDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(DATADIR) \
|
||||
$(DESTDIR)$(COMPLETIONDIR) $(DESTDIR)$(SYSCONFDIR)/default
|
||||
$(DESTDIR)$(COMPLETIONDIR) $(DESTDIR)$(SYSCONFDIR)/default $(DESTDIR)$(SYSCONFDIR)/systemd
|
||||
$(SUBST) bin/terractl > $(DESTDIR)$(BINDIR)/terractl
|
||||
chmod 755 $(DESTDIR)$(BINDIR)/terractl
|
||||
$(SUBST) systemd/terraria@.service > $(DESTDIR)$(UNITDIR)/terraria@.service
|
||||
@@ -59,11 +59,17 @@ install:
|
||||
else \
|
||||
install -m 644 config/default/terractl $(DESTDIR)$(SYSCONFDIR)/default/terractl; \
|
||||
fi
|
||||
@if [ -e $(DESTDIR)$(SYSCONFDIR)/systemd/journald@terraria.conf ]; then \
|
||||
echo "keeping existing $(DESTDIR)$(SYSCONFDIR)/systemd/journald@terraria.conf"; \
|
||||
else \
|
||||
install -m 644 config/journald/journald@terraria.conf $(DESTDIR)$(SYSCONFDIR)/systemd/journald@terraria.conf; \
|
||||
fi
|
||||
@# On a real install (not staging for a package), set up the user and directories
|
||||
@if [ -z "$(DESTDIR)" ]; then \
|
||||
systemd-sysusers terractl.conf && \
|
||||
systemd-tmpfiles --create terractl.conf && \
|
||||
if [ -d /run/systemd/system ]; then systemctl daemon-reload; fi && \
|
||||
$(BINDIR)/terractl journal-access && \
|
||||
echo "Installed terractl $(VERSION). See $(DOCDIR)/README.md"; \
|
||||
fi
|
||||
|
||||
@@ -74,7 +80,8 @@ uninstall:
|
||||
$(DESTDIR)$(COMPLETIONDIR)/terractl
|
||||
rm -rf $(DESTDIR)$(DOCDIR) $(DESTDIR)$(DATADIR)
|
||||
@if [ -z "$(DESTDIR)" ] && [ -d /run/systemd/system ]; then systemctl daemon-reload; fi
|
||||
@echo "Removed. Kept: $(SYSCONFDIR)/default/terractl, /var/lib/terraria and the terraria user."
|
||||
@echo "Removed. Kept: $(SYSCONFDIR)/default/terractl, $(SYSCONFDIR)/systemd/journald@terraria.conf,"
|
||||
@echo "/var/lib/terraria, the servers' journal and the terraria user."
|
||||
|
||||
deb: check
|
||||
rm -rf $(STAGE)
|
||||
|
||||
Reference in new issue
Block a user