From e5760e3e1832ddb74885acbc93e39c9659c90d0c Mon Sep 17 00:00:00 2001 From: xengineering Date: Fri, 11 Nov 2022 16:55:31 +0100 Subject: Remove systemd related parts This repository is just about the generic source code. Adapting it to a certain Linux distribution which might be systemd based is up to a packaging repository. --- Makefile | 4 ---- main.go | 3 --- systemd/ceres.service | 14 -------------- systemd/ceres.sysusers | 1 - systemd/ceres.tmpfiles | 4 ---- 5 files changed, 26 deletions(-) delete mode 100644 systemd/ceres.service delete mode 100644 systemd/ceres.sysusers delete mode 100644 systemd/ceres.tmpfiles diff --git a/Makefile b/Makefile index 391c6ea..15e100b 100644 --- a/Makefile +++ b/Makefile @@ -29,12 +29,8 @@ install: all install -Dm 644 data/templates/index.html $(DESTDIR)$(PREFIX)/share/ceres/templates/index.html install -Dm 644 data/templates/recipe.html $(DESTDIR)$(PREFIX)/share/ceres/templates/recipe.html - install -Dm 644 systemd/ceres.service $(DESTDIR)$(PREFIX)/lib/systemd/system/ceres.service - install -Dm 644 systemd/ceres.sysusers $(DESTDIR)$(PREFIX)/lib/sysusers.d/ceres.conf - install -Dm 644 systemd/ceres.tmpfiles $(DESTDIR)$(PREFIX)/lib/tmpfiles.d/ceres.conf install -Dm 644 sql/0001_migration.sql $(DESTDIR)$(PREFIX)/share/ceres/migrations/0001_migration.sql install -Dm 644 sql/0002_migration.sql $(DESTDIR)$(PREFIX)/share/ceres/migrations/0002_migration.sql debug: go run main.go -d -c config/default.json - diff --git a/main.go b/main.go index 9571935..4efab32 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,6 @@ import ( func main() { - // disable log timestamp because systemd takes care of that - log.SetFlags(0) - // read all sources of runtime configuration (e.g. CLI flags and config file) config := utils.GetRuntimeConfig() diff --git a/systemd/ceres.service b/systemd/ceres.service deleted file mode 100644 index 12b63c9..0000000 --- a/systemd/ceres.service +++ /dev/null @@ -1,14 +0,0 @@ - -[Unit] -Description=Recipe server for your favorite dishes -After=network.target -After=mariadb.service - -[Service] -User=ceres -Group=ceres -ExecStart=/usr/bin/ceres - -[Install] -WantedBy=multi-user.target - diff --git a/systemd/ceres.sysusers b/systemd/ceres.sysusers deleted file mode 100644 index e269688..0000000 --- a/systemd/ceres.sysusers +++ /dev/null @@ -1 +0,0 @@ -u ceres - "ceres daemon user" - /bin/bash diff --git a/systemd/ceres.tmpfiles b/systemd/ceres.tmpfiles deleted file mode 100644 index 1c3101c..0000000 --- a/systemd/ceres.tmpfiles +++ /dev/null @@ -1,4 +0,0 @@ -d /var/lib/ceres 0750 -d /var/lib/ceres/recipes 0750 -d /var/lib/ceres/recipes/image 0750 -Z /var/lib/ceres - ceres ceres -- cgit v1.2.3-70-g09d2