summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--install12
-rw-r--r--oragono.service3
-rw-r--r--oragono.sysusers1
-rw-r--r--oragono.tmpfiles1
6 files changed, 31 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a8a30d179e1..a1e96383ba4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = oragono
pkgdesc = A modern IRC server written in Go.
pkgver = 0.10.3
- pkgrel = 5
+ pkgrel = 6
url = https://github.com/oragono/oragono
install = install
arch = x86_64
@@ -13,11 +13,15 @@ pkgbase = oragono
source = git+https://github.com/oragono/oragono#tag=v0.10.3
source = git+https://github.com/oragono/oragono-vendor
source = oragono.service
+ source = oragono.sysusers
source = path.patch
+ source = oragono.tmpfiles
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 88cf6274839ac8d9f32f9a81068d11e762ddfc28f8fada305b693a8524e593ce
+ sha256sums = d35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858
+ sha256sums = 7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4
sha256sums = 8972e3fc24d0aca75614048f14487b6eb1e43a9edf212626f5a74b59f1051d8c
+ sha256sums = d56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a
pkgname = oragono
diff --git a/PKGBUILD b/PKGBUILD
index 9f01b440c8e9..1ac791179de3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=oragono
pkgver=0.10.3
-pkgrel=5
+pkgrel=6
pkgdesc="A modern IRC server written in Go."
arch=('x86_64')
url="https://github.com/oragono/oragono"
@@ -13,11 +13,15 @@ makedepends=('go' 'git')
source=("git+$url#tag=v$pkgver"
"git+https://github.com/oragono/oragono-vendor"
"oragono.service"
- "path.patch")
+ "oragono.sysusers"
+ "path.patch"
+ "oragono.tmpfiles")
sha256sums=('SKIP'
'SKIP'
- '88cf6274839ac8d9f32f9a81068d11e762ddfc28f8fada305b693a8524e593ce'
- '8972e3fc24d0aca75614048f14487b6eb1e43a9edf212626f5a74b59f1051d8c')
+ 'd35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858'
+ '7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4'
+ '8972e3fc24d0aca75614048f14487b6eb1e43a9edf212626f5a74b59f1051d8c'
+ 'd56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a')
backup=('etc/oragono.conf')
build() {
export GOPATH=$(pwd)/..
@@ -34,15 +38,15 @@ build() {
ln -s $_path/mkcerts $pkgname/mkcerts
cd $_path
GOOS=linux GOARCH=amd64 go build oragono.go
- echo "Arch Linux AUR: $pkgver-$pkgrel" >> oragono.motd
}
package() {
local _conf=/var/lib/oragono/
install -Dm 644 oragono.service $pkgdir/usr/lib/systemd/system/oragono.service
+ install -Dm644 "$srcdir/oragono.sysusers" "$pkgdir/usr/lib/sysusers.d/oragono.conf"
+ install -Dm644 "$srcdir/oragono.tmpfiles" "${pkgdir}"/usr/lib/tmpfiles.d/oragono.conf
cd ${srcdir}/$pkgname
install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
install -Dm 755 oragono $pkgdir/usr/bin/oragono
- install -Dm 644 oragono.motd $pkgdir/$_conf/ircd.motd
install -Dm 644 oragono.yaml $pkgdir/etc/oragono.conf
}
diff --git a/install b/install
index dc4f4622a2c8..243a8e7b53e9 100644
--- a/install
+++ b/install
@@ -1,4 +1,12 @@
post_install() {
- /usr/bin/oragono initdb --conf /etc/oragono.conf
- cd /var/lib/oragono/ && /usr/bin/oragono mkcerts --conf /etc/oragono.conf
+ if [[ ! -e /var/lib/oragono/ircd.db ]]; then
+ cat <<-EOF
+ ==> oragono needs to initialize the database and have
+ certificates made available prior to use.
+
+ cd /var/lib/oragono
+ sudo -u oragono /usr/bin/oragono initdb --conf /etc/oragono.conf
+ sudo -u oragono /usr/bin/oragono mkcerts --conf /etc/oragono.conf
+ EOF
+ fi
}
diff --git a/oragono.service b/oragono.service
index d15d68cc9850..37c2bbfe9ae4 100644
--- a/oragono.service
+++ b/oragono.service
@@ -4,6 +4,9 @@ After=network.target
[Service]
Type=simple
+User=oragono
+Group=oragono
+WorkingDirectory=/var/lib/oragono
ExecStart=/usr/bin/oragono run --conf /etc/oragono.conf
ExecReload=/bin/kill -HUP $MAINPID
Restart=on-failure
diff --git a/oragono.sysusers b/oragono.sysusers
new file mode 100644
index 000000000000..fd46f72070b5
--- /dev/null
+++ b/oragono.sysusers
@@ -0,0 +1 @@
+u oragono - "oragono IRC daemon" /var/lib/oragono
diff --git a/oragono.tmpfiles b/oragono.tmpfiles
new file mode 100644
index 000000000000..dd20132bdbac
--- /dev/null
+++ b/oragono.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/oragono 0755 oragono oragono