summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited2019-01-19 15:32:43 -0600
committerSam Whited2019-01-19 15:32:43 -0600
commit1a56e8a55c6dfb3c42e762159c0340353e3a870a (patch)
treefd3d39e88b879d869c3025aa9fc38d55a714812e
parent8abb31368b798f5f0c7029f6aa225a69978b035d (diff)
downloadaur-1a56e8a55c6dfb3c42e762159c0340353e3a870a.tar.gz
Saner default config
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD11
-rw-r--r--jackal.yml35
3 files changed, 27 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 87c59a08930..562081bbf24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
pkgbase = jackal
pkgdesc = An XMPP/Jabber server
pkgver = 0.4.6
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/ortuman/jackal
install = jackal.install
arch = x86_64
arch = i686
- arch = arm
- arch = armv6h
- arch = armv7h
- arch = aarch64
license = GPL3
- makedepends = go>=1.11.0
+ makedepends = go>=1.11
depends = glibc
+ optdepends = postgresql: PostgreSQL support
optdepends = mariadb: MariaDB support
conflicts = jackal-git
backup = etc/jackal/jackal.yml
@@ -25,7 +22,7 @@ pkgbase = jackal
sha256sums = 537ff4d0a3467f0b4ed64c677fcdb0d160bdc38af9ded2e2e33783a88c9e8f3b
sha256sums = 5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3
sha256sums = 6692334f0d5157d8da200e1d1e3817805a321342c02677cb0a97236c68cf465e
- sha256sums = 490d8da615e0f2517bb4493cb42bfa3de902fdd47b0e8e9f289bd2da12846be4
+ sha256sums = e7e0b6d701c4e0c7b76fb3b446e01926368325e70aff04fa33eb5f9e88f392be
pkgname = jackal
diff --git a/PKGBUILD b/PKGBUILD
index 76e00831ac3..712b55cd021 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,15 @@
pkgname=jackal
pkgver=0.4.6
-pkgrel=1
+pkgrel=2
pkgdesc='An XMPP/Jabber server'
-arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+arch=('x86_64' 'i686')
url='https://github.com/ortuman/jackal'
license=('GPL3')
depends=('glibc')
-makedepends=('go>=1.11.0')
-optdepends=('mariadb: MariaDB support')
+makedepends=('go>=1.11')
+optdepends=('postgresql: PostgreSQL support'
+ 'mariadb: MariaDB support')
conflicts=('jackal-git')
backup=('etc/jackal/jackal.yml')
source=(https://github.com/ortuman/jackal/archive/v${pkgver}.tar.gz
@@ -21,7 +22,7 @@ sha256sums=('1c6c8827d905802a35f42bac73476eead768cf8a5540334403e3ee241c2162e2'
'537ff4d0a3467f0b4ed64c677fcdb0d160bdc38af9ded2e2e33783a88c9e8f3b'
'5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3'
'6692334f0d5157d8da200e1d1e3817805a321342c02677cb0a97236c68cf465e'
- '490d8da615e0f2517bb4493cb42bfa3de902fdd47b0e8e9f289bd2da12846be4')
+ 'e7e0b6d701c4e0c7b76fb3b446e01926368325e70aff04fa33eb5f9e88f392be')
install=jackal.install
build() {
diff --git a/jackal.yml b/jackal.yml
index e0311f2ecca..81e10533676 100644
--- a/jackal.yml
+++ b/jackal.yml
@@ -1,25 +1,25 @@
pid_path: data/jackal.pid
-debug:
- port: 6060
+# debug:
+# port: 6060
logger:
level: debug
log_path: jackal.log
storage:
- type: mysql
- mysql:
- host: 127.0.0.1:3306
+ type: pgsql
+ pgsql:
+ host: 127.0.0.1:5432
user: jackal
password: password
database: jackal
pool_size: 16
-cluster:
- name: node1
- port: 5010
- hosts: [127.0.0.1:5009, 127.0.0.1:5011]
+# cluster:
+# name: node1
+# port: 5010
+# hosts: [127.0.0.1:5009, 127.0.0.1:5011]
router:
hosts:
@@ -75,19 +75,18 @@ c2s:
max_stanza_size: 65536
resource_conflict: replace # [override, replace, reject]
- transport:
- type: socket # websocket
- bind_addr: 0.0.0.0
- port: 5222
- keep_alive: 120
- # url_path: /xmpp/ws
+ # transport:
+ # type: socket # websocket
+ # bind_addr: 0.0.0.0
+ # port: 5222
+ # keep_alive: 120
+ # url_path: /xmpp/ws
- compression:
- level: default
+ # compression:
+ # level: default
sasl:
- plain
- - digest_md5
- scram_sha_1
- scram_sha_256