1
0
Fork 0
forked from mirror/prosody

* upgrade to 0.10

This commit is contained in:
shaula 2018-01-13 23:31:10 +00:00
parent 678ba9c79c
commit 3e022f69eb
3 changed files with 7 additions and 4 deletions

View file

@ -4,6 +4,7 @@ RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \ && DEBIAN_FRONTEND=noninteractive apt-get install -y \
libevent-dev \ libevent-dev \
lua5.1 \ lua5.1 \
lua-bitop \
lua-dbi-sqlite3 \ lua-dbi-sqlite3 \
lua-dbi-mysql \ lua-dbi-mysql \
lua-dbi-postgresql \ lua-dbi-postgresql \
@ -16,9 +17,9 @@ RUN apt-get update \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ENV PROSODY_VERSION 0.9.12 ENV PROSODY_VERSION 0.10.0
ENV PROSODY_DOWNLOAD_URL https://prosody.im/downloads/source/prosody-${PROSODY_VERSION}.tar.gz ENV PROSODY_DOWNLOAD_URL https://prosody.im/downloads/source/prosody-${PROSODY_VERSION}.tar.gz
ENV PROSODY_DOWNLOAD_SHA1 1ee224263a5b3d67960e12edbbe6b2f16b95d147 ENV PROSODY_DOWNLOAD_SHA1 57c1c5a665e6453bdde06727ef398cd69accd9d7
RUN buildDeps='gcc libc6-dev make liblua5.1-dev libidn11-dev libssl-dev' \ RUN buildDeps='gcc libc6-dev make liblua5.1-dev libidn11-dev libssl-dev' \
&& set -x \ && set -x \
@ -58,7 +59,6 @@ RUN docker-prosody-module-install \
e2e_policy `# require end-2-end encryption` \ e2e_policy `# require end-2-end encryption` \
filter_chatstates `# disable "X is typing" type messages` \ filter_chatstates `# disable "X is typing" type messages` \
http_upload `# file sharing (XEP-0363)` \ http_upload `# file sharing (XEP-0363)` \
mam `# message archive management (XEP-0313)` \
smacks `# stream management (XEP-0198)` \ smacks `# stream management (XEP-0198)` \
throttle_presence `# presence throttling in CSI` throttle_presence `# presence throttling in CSI`

View file

@ -9,11 +9,11 @@ modules_enabled = {
"disco"; -- Service discovery "disco"; -- Service discovery
-- Not essential, but recommended -- Not essential, but recommended
"blocklist"; -- simple modern protocol for blocking remote JIDs (XEP-0191)
"private"; -- Private XML storage (for room bookmarks, etc.) "private"; -- Private XML storage (for room bookmarks, etc.)
"vcard"; -- Allow users to set vCards "vcard"; -- Allow users to set vCards
-- These are commented by default as they have a performance impact -- These are commented by default as they have a performance impact
"privacy"; -- Support privacy lists
--"compression"; -- Stream compression (Debian: requires lua-zlib module to work) --"compression"; -- Stream compression (Debian: requires lua-zlib module to work)
-- Nice to have -- Nice to have

View file

@ -4,6 +4,9 @@ sql = {
database = "prosody.sqlite"; database = "prosody.sqlite";
} }
-- make 0.10-distributed mod_mam use sql store
archive_store = "archive2" -- Use the same data store as prosody-modules mod_mam
storage = { storage = {
-- this makes mod_mam use the sql storage backend -- this makes mod_mam use the sql storage backend
archive2 = "sql"; archive2 = "sql";