Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport enhancements #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Backport enhancements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3aa0be
add support for mysql and ssl
philhug Jul 23, 2017
5e9d112
Minimal enhancements for install process
J0WI Jan 4, 2019
d66dde6
Merge pull request #1 from ppschweiz/enh-inst
cambid Jan 9, 2019
0c1d817
Update murmur to 1.2.19-r9
J0WI Apr 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ USER root
COPY murmur.ini /etc/murmur.tpl
COPY init.sh /usr/bin/init.sh

RUN apk upgrade --update-cache --available && \
apk --no-cache add murmur
ENV MURMUR_ALPINE_VERSION 1.2.19-r9

RUN apk add --no-cache \
murmur>="$MURMUR_ALPINE_VERSION" \
qt-mysql \
;

RUN addgroup mumble && \
adduser -h /home/mumble -s /sbin/nologin -D -G mumble mumble && \
Expand Down
12 changes: 12 additions & 0 deletions init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ if [ ! -e /data/murmur.ini ]; then
if [ ! -z "$REGISTER_NAME" ] ; then echo 'registerName='"$REGISTER_NAME" >> /data/murmur.ini ; fi
if [ ! -z "$BANDWIDTH" ] ; then echo 'bandwidth='"$BANDWIDTH" >> /data/murmur.ini ; fi
if [ ! -z "$SUPW" ] ; then /usr/bin/murmurd -fg -ini /data/murmur.ini -supw $SUPW ;fi
if [ ! -z "$SSL_CERT" ] ; then echo 'sslCert='"$SSL_CERT" >> /data/murmur.ini ; fi
if [ ! -z "$SSL_KEY" ] ; then echo 'sslKey='"$SSL_KEY" >> /data/murmur.ini ; fi
if [ ! -z "$SSL_CA" ] ; then echo 'sslCA='"$SSL_CA" >> /data/murmur.ini ; fi
if [ ! -z "$MYSQL_DATABASE" ] ; then
echo 'dbDriver=QMYSQL' >> /data/murmur.ini
if [ ! -z "$MYSQL_DATABASE" ] ; then echo 'database='"$MYSQL_DATABASE" >> /data/murmur.ini ; fi
if [ ! -z "$MYSQL_HOST" ] ; then echo 'dbHost='"$MYSQL_HOST" >> /data/murmur.ini ; fi
if [ ! -z "$MYSQL_USER" ] ; then echo 'dbUsername='"$MYSQL_USER" >> /data/murmur.ini ; fi
if [ ! -z "$MYSQL_PASSWORD" ] ; then echo 'dbPassword='"$MYSQL_PASSWORD" >> /data/murmur.ini ; fi
else
echo 'database=/data/db.sqlite' >> /data/murmur.ini
fi
echo Initilization Completed
fi

Expand Down
1 change: 0 additions & 1 deletion murmur.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
host=0.0.0.0
database=/data/db.sqlite
port=64738

autobanAttempts = 10
Expand Down