added imapsql-ctl tool and fixed sysusers, tmpfiles

4 files changed, 38 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ec6dca13e55b..96cc07d4539d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,20 +4,25 @@
 
 pkgname=maddy-git
 pkgver=0.1
-pkgrel=3
+pkgrel=5
 pkgdesc="Fast, cross-platform mail server"
 arch=(any)
 url="https://github.com/emersion/maddy"
 license=('MIT')
-makedepends=('git' 'go')
+makedepends=('git' 'go' 'scdoc')
 source=("git+https://github.com/emersion/maddy.git"
+	"git+https://github.com/foxcpp/go-imap-sql.git"
+	"maddy.sysusers"
+	"maddy.tmpfiles"
 	"maddy.service")
-install="maddy.install"
 conflicts=("maddy")
 provides=("maddy")
 backup=('etc/maddy/maddy.conf')
 sha512sums=('SKIP'
-	    'e49efa944c4bd4e9241f808dd8449c2448c4801493182a0b9fe10e32600e19d0dc80e358e0f8bc46c35c3d3ee0dc5417d3dcfe4541054e15499b3f9305170092')
+	    'SKIP'
+	    '750346110adb8caa61f537560018497f73543dc01ff26aceed2f052f281a35fdc659c9c478cc55775eadf8a3d17b511d5bed86334d1c455732dcb9a273120589'
+	    'f33135b81129d6ef3006d8e9f410ec0d7e44226ae640dea77d756268d0e97828d8965ac75d0d9b49604a19b8b9e0384d15007d33c4b813f359108d28a10702b5'
+	    '34e63fd415ed225bdf0a974523cc4d903b1c25ebf5d3c8a7e9bbfe48cb7fe5019f79f4ff058e463d54c996cfdec31c456c155a525a9bbb76ab05a2ef920f95fa')
 
 pkgver() {
   cd "maddy"
@@ -30,6 +35,9 @@ prepare() {
   export GOPATH="${srcdir}"
   export GO111MODULE=on
   go get -v
+
+  cd "${srcdir}/go-imap-sql"
+  go get -v
 }
 
 build() {
@@ -37,16 +45,27 @@ build() {
   export GOPATH="${srcdir}"
   export GO111MODULE=on
   go build -v
+  scdoc < maddy.conf.5.scd > maddy.conf.5
+  scdoc < maddy.1.scd > maddy.1
+  gzip -c maddy.conf.5 > "maddy.conf.5.gz"
+  gzip -c maddy.1 > "maddy.1.gz"
   cd cmd/maddy
   go build -v
+
+  cd "${srcdir}/go-imap-sql/cmd/imapsql-ctl"
+  go build -v
 }
 
 package() {
-  cd "${srcdir}/maddy"
-  install -Dm755 "${srcdir}/maddy/cmd/maddy/maddy" "${pkgdir}/usr/bin/maddy"
-  install -Dm644 "${srcdir}/maddy.service" "${pkgdir}/usr/lib/systemd/system/maddy.service"
+  install -Dm 0755 "${srcdir}/maddy/cmd/maddy/maddy" "${pkgdir}/usr/bin/maddy"
+  install -Dm 0755 "${srcdir}/go-imap-sql/cmd/imapsql-ctl/imapsql-ctl" "${pkgdir}/usr/bin/imapsql-ctl"
   install -D "${srcdir}/maddy/LICENSE" "${pkgdir}/usr/share/licenses/maddy/LICENSE"
-  mkdir -p "${pkgdir}/var/lib/maddy"
-  mkdir -p "${pkgdir}/etc/maddy"
-  cp -r "${srcdir}/maddy/maddy.conf" "${pkgdir}/etc/maddy/"
+
+  install -Dm 0644 "${srcdir}/maddy/maddy.conf" "${pkgdir}/etc/maddy/maddy.conf"
+  install -Dm 0644 "${srcdir}/maddy/maddy.1.gz" "${pkgdir}/usr/share/man/man1/maddy.1.gz"
+  install -Dm 0644 "${srcdir}/maddy/maddy.conf.5.gz" "${pkgdir}/usr/share/man/man5/maddy.conf.5.gz"
+
+  install -Dm 0644 "${srcdir}/maddy.service" "${pkgdir}/usr/lib/systemd/system/maddy.service"
+  install -Dm 0644 "${srcdir}/maddy.sysusers" "${pkgdir}/usr/lib/sysusers.d/maddy.conf"
+  install -Dm 0644 "${srcdir}/maddy.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/maddy.conf"
 }
diff --git a/maddy.service b/maddy.service
index d1f7ef4f2cf8..7e4f8020eb45 100644
--- a/maddy.service
+++ b/maddy.service
@@ -9,7 +9,14 @@ Group=maddy
 RuntimeDirectory=maddy
 WorkingDirectory=/var/lib/maddy
 ExecStart=/usr/bin/maddy
+LimitNOFILE=1048576
+LimitNPROC=64
 PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
+ReadWritePaths=/var/lib/maddy
+AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
 WantedBy=multi-user.target
diff --git a/maddy.sysusers b/maddy.sysusers
new file mode 100644
index 000000000000..231a6c01bc6f
--- /dev/null
+++ b/maddy.sysusers
@@ -0,0 +1 @@
+u   maddy   -   "maddy mail server"     /     /sbin/nologin
diff --git a/maddy.tmpfiles b/maddy.tmpfiles
new file mode 100644
index 000000000000..a6c9b7b911e0
--- /dev/null
+++ b/maddy.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/maddy                    0750        maddy   maddy   -