diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | config.patch | 55 | ||||
| -rw-r--r-- | jackal.yml | 101 |
4 files changed, 71 insertions, 113 deletions
@@ -1,7 +1,7 @@ pkgbase = jackal pkgdesc = An XMPP/Jabber server - pkgver = 0.4.6 - pkgrel = 3 + pkgver = 0.4.7 + pkgrel = 1 url = https://github.com/ortuman/jackal install = jackal.install arch = x86_64 @@ -13,16 +13,16 @@ pkgbase = jackal optdepends = mariadb: MariaDB support conflicts = jackal-git backup = etc/jackal/jackal.yml - source = https://github.com/ortuman/jackal/archive/v0.4.6.tar.gz + source = https://github.com/ortuman/jackal/archive/v0.4.7.tar.gz source = jackal.service source = jackal.sysusers source = jackal.tmpfiles - source = jackal.yml - sha256sums = 1c6c8827d905802a35f42bac73476eead768cf8a5540334403e3ee241c2162e2 + source = config.patch + sha256sums = 9db6b00f8a8ea38d6c067fcef238b21740a6a534138f6c5e038eb842e95f0976 sha256sums = 0a9a9065957e5b0576e5443b29bf0cae81281194664376569a91c51f85e7d7ff sha256sums = 5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3 sha256sums = 20b7e5a5fee727e72fdbac54182b594a838340c0625036ca9d117e2a9d710045 - sha256sums = e7e0b6d701c4e0c7b76fb3b446e01926368325e70aff04fa33eb5f9e88f392be + sha256sums = 8186bba156ef45d5c994172cb29b01f6f56c27fcdcb0fa236c3248c8bf30c114 pkgname = jackal @@ -1,8 +1,8 @@ # Maintainer: Sam Whited <sam@samwhited.com> pkgname=jackal -pkgver=0.4.6 -pkgrel=3 +pkgver=0.4.7 +pkgrel=1 pkgdesc='An XMPP/Jabber server' arch=('x86_64' 'i686') url='https://github.com/ortuman/jackal' @@ -17,14 +17,18 @@ source=(https://github.com/ortuman/jackal/archive/v${pkgver}.tar.gz jackal.service jackal.sysusers jackal.tmpfiles - jackal.yml) -sha256sums=('1c6c8827d905802a35f42bac73476eead768cf8a5540334403e3ee241c2162e2' + config.patch) +sha256sums=('9db6b00f8a8ea38d6c067fcef238b21740a6a534138f6c5e038eb842e95f0976' '0a9a9065957e5b0576e5443b29bf0cae81281194664376569a91c51f85e7d7ff' '5fec4f4053ac15cd597bb32ba03c35d85f52438204fd801edf333403ec2c4bf3' '20b7e5a5fee727e72fdbac54182b594a838340c0625036ca9d117e2a9d710045' - 'e7e0b6d701c4e0c7b76fb3b446e01926368325e70aff04fa33eb5f9e88f392be') + '8186bba156ef45d5c994172cb29b01f6f56c27fcdcb0fa236c3248c8bf30c114') install=jackal.install +prepare() { + patch -p1 < ../config.patch +} + build() { cd jackal-${pkgver} export GO111MODULE=on @@ -38,7 +42,7 @@ package() { install -dm 775 "${pkgdir}/usr/share/doc/jackal/" install -dm 775 "${pkgdir}/usr/share/jackal/" - install -D jackal.yml "${pkgdir}/etc/jackal/jackal.yml" + install -D "${srcdir}/jackal-${pkgver}/example.jackal.yml" "${pkgdir}/etc/jackal/jackal.yml" install -Dm444 "${srcdir}/jackal-${pkgver}/README.md" "${pkgdir}/usr/share/doc/jackal/" cp -r "${srcdir}/jackal-${pkgver}/sql/" "${pkgdir}/usr/share/jackal/" install -Dm755 "${srcdir}/jackal-${pkgver}/jackal" "${pkgdir}/usr/bin/jackal" diff --git a/config.patch b/config.patch new file mode 100644 index 000000000000..a4d766e09244 --- /dev/null +++ b/config.patch @@ -0,0 +1,55 @@ +--- src/jackal-0.4.7/example.jackal.yml 2019-01-22 14:05:33.000000000 -0600 ++++ example.jackal.yml 2019-01-22 14:58:11.695532598 -0600 +@@ -1,18 +1,18 @@ + # jackal default configuration file + +-pid_path: jackal.pid ++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 +@@ -67,19 +67,18 @@ + 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 + - scram_sha_512 diff --git a/jackal.yml b/jackal.yml deleted file mode 100644 index 81e10533676e..000000000000 --- a/jackal.yml +++ /dev/null @@ -1,101 +0,0 @@ -pid_path: data/jackal.pid - -# debug: -# port: 6060 - -logger: - level: debug - log_path: jackal.log - -storage: - 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] - -router: - hosts: - - name: localhost - tls: - privkey_path: "" - cert_path: "" - -modules: - enabled: - - roster # Roster - - last_activity # XEP-0012: Last Activity - - private # XEP-0049: Private XML Storage - - vcard # XEP-0054: vcard-temp - - registration # XEP-0077: In-Band Registration - - version # XEP-0092: Software Version - - blocking_command # XEP-0191: Blocking Command - - ping # XEP-0199: XMPP Ping - - offline # Offline storage - - mod_roster: - versioning: true - - mod_offline: - queue_size: 2500 - - mod_registration: - allow_registration: yes - allow_change: yes - allow_cancel: yes - - mod_version: - show_os: true - - mod_ping: - send: no - send_interval: 60 - -components: -# http_upload: -# host: upload.jackal.im -# base_url: https://jackal.im:4430/upload -# port: 4430 -# upload_path: /var/lib/jackal/httpupload -# size_limit: 1048576 -# quota: 0 -# expire_after: 600 # secs. - -c2s: - - id: default - - connect_timeout: 5 - 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 - - # compression: - # level: default - - sasl: - - plain - - scram_sha_1 - - scram_sha_256 - -#s2s: -# dial_timeout: 15 -# dialback_secret: s3cr3tf0rd14lb4ck -# max_stanza_size: 131072 -# -# transport: -# bind_addr: 0.0.0.0 -# port: 5269 -# keep_alive: 600 |