Add service file and install script

4 files changed, 52 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff8ec9665d12..9236c9bdf82e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,16 @@
 pkgbase = caddy2
 	pkgdesc = Fast, cross-platform HTTP/2 web server with automatic HTTPS
 	pkgver = beta6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/caddyserver/caddy
 	arch = x86_64
 	license = Apache
 	makedepends = go
+	conflicts = caddy
 	source = caddy2-beta6.tar.gz::https://github.com/caddyserver/caddy/archive/v2.0.0-beta6.tar.gz
+	source = caddy.service
 	sha256sums = cbcd8ef9eb091c8431e5169c9acfa67f9641d6406a32b383c850bf6429a47182
+	sha256sums = c3eb327ba564b167e508b2bfa76ef459cacef09fb2e67a7f09944cb8f92e3207
 
 pkgname = caddy2
 
diff --git a/PKGBUILD b/PKGBUILD
index 9d51d997491d..0191cfdf3ccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,26 +2,29 @@
 
 pkgname=caddy2
 pkgver=beta6
-pkgrel=1
+pkgrel=2
 pkgdesc='Fast, cross-platform HTTP/2 web server with automatic HTTPS'
 arch=('x86_64')
 license=('Apache')
 url='https://github.com/caddyserver/caddy'
 depends=()
+conflicts=('caddy')
 makedepends=('go')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/caddyserver/caddy/archive/v2.0.0-${pkgver}.tar.gz")
-sha256sums=('cbcd8ef9eb091c8431e5169c9acfa67f9641d6406a32b383c850bf6429a47182')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/caddyserver/caddy/archive/v2.0.0-${pkgver}.tar.gz"
+        "caddy.service")
+sha256sums=('cbcd8ef9eb091c8431e5169c9acfa67f9641d6406a32b383c850bf6429a47182'
+            'c3eb327ba564b167e508b2bfa76ef459cacef09fb2e67a7f09944cb8f92e3207')
 
 build() {
   cd ${srcdir}/caddy-2.0.0-${pkgver}
   export GOPATH="$srcdir"
   go build -v -o caddy cmd/caddy/main.go
-  
 }
 
 package() {
+  mkdir -p "$pkgdir/etc/caddy"
+  install -D -m 0644 caddy.service "$pkgdir/usr/lib/systemd/system/caddy.service"
   cd ${srcdir}/caddy-2.0.0-${pkgver}
-
   install -D -m 0755 caddy "$pkgdir/usr/bin/caddy"
 }
 
diff --git a/caddy.service b/caddy.service
new file mode 100644
index 000000000000..74bff04f37ad
--- /dev/null
+++ b/caddy.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Caddy 2 HTTP/2 web server
+After=network-online.target
+
+[Service]
+User=http
+Group=http
+ExecStart=/usr/bin/caddy run --config /etc/caddy2/Caddyfile --adapter caddyfile
+ExecReload=/usr/bin/caddy reload --config /etc/caddy2/Caddyfile --adapter caddyfile
+ExecStop=/usr/bin/caddy stop
+LimitNOFILE=1048576
+LimitNPROC=64
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
+ReadWritePaths=/var/lib/caddy2
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/caddy2.install b/caddy2.install
new file mode 100644
index 000000000000..537c3c909184
--- /dev/null
+++ b/caddy2.install
@@ -0,0 +1,18 @@
+post_install() {
+        systemctl --quiet daemon-reload
+        systemctl --quiet preset caddy.service
+}
+
+post_upgrade() {
+        systemctl --quiet daemon-reload
+        systemd-tmpfiles --create caddy.service
+        systemctl --quiet try-restart caddy.service
+}
+
+pre_remove() {
+        systemctl --quiet --no-reload disable --now caddy.service
+}
+
+post_remove() {
+        systemctl --quiet daemon-reload
+}