From 70c0fbec367b6bfd8779d88fdde919be7006c730 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Sat, 22 Apr 2017 16:29:55 +0000
Subject: [PATCH] Make an entrypoint compatible for both branches

---
 Dockerfile          | 58 ---------------------------------------------
 files/entrypoint.sh |  4 ++--
 2 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 332527d..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM alpine:3.5
-
-MAINTAINER Adrien Ferrand <ferrand.ad@gmail.com>
-
-ENV BACKUPPC_VERSION 4.1.1
-ENV BACKUPPC_XS_VERSION 0.53
-ENV RSYNC_BPC_VERSION 3.0.9.6
-ENV PAR2_VERSION v0.7.0
-
-RUN apk --no-cache add \
-# Install backuppc build dependencies
-gcc g++ autoconf automake make git patch perl perl-dev perl-cgi expat expat-dev curl wget \
-# Install backuppc runtime dependencies
-supervisor rsync samba-client iputils openssh openssl rrdtool msmtp lighttpd lighttpd-mod_auth gzip apache2-utils \
-# Compile and install needed perl modules
-&& cpan App::cpanminus \
-&& cpanm -n Archive::Zip XML::RSS File::Listing \
-
-# Compile and install BackupPC:XS
-&& git clone https://github.com/backuppc/backuppc-xs.git /root/backuppc-xs --branch $BACKUPPC_XS_VERSION \
-&& cd /root/backuppc-xs \
-# => temporary correction on version 0.53, already done on master: can be removed with version 0.54
-&& printf "\n#define ACCESSPERMS 0777" >> rsync.h \
-&& perl Makefile.PL && make && make test && make install \
-
-# Compile and install Rsync (BPC version)
-&& git clone https://github.com/backuppc/rsync-bpc.git /root/rsync-bpc --branch $RSYNC_BPC_VERSION \
-&& cd /root/rsync-bpc && ./configure && make reconfigure && make && make install \
-
-# Compile and install PAR2
-&& git clone https://github.com/Parchive/par2cmdline.git /root/par2cmdline --branch $PAR2_VERSION \
-&& cd /root/par2cmdline && ./automake.sh && ./configure && make && make check && make install \
-
-# Configure MSMTP for mail delivery (initially sendmail is a sym link to busybox)
-&& rm -f /usr/sbin/sendmail \
-&& ln -s /usr/bin/msmtp /usr/sbin/sendmail \
-
-# Get BackupPC, it will be installed at runtime to allow dynamic upgrade of existing config/pool
-&& curl -o /root/BackupPC-$BACKUPPC_VERSION.tar.gz -L https://github.com/backuppc/backuppc/releases/download/$BACKUPPC_VERSION/BackupPC-$BACKUPPC_VERSION.tar.gz \
-# Prepare backuppc home
-&& mkdir -p /home/backuppc \
-# Mark the docker as not runned yet, to allow entrypoint to do its stuff
-&& touch /firstrun \
-# Clean
-&& rm -rf /root/backuppc-xs /root/rsync-bpc /root/par2cmdline \
-&& apk del gcc g++ autoconf automake make git patch perl-dev expat-dev curl wget
-
-COPY files/lighttpd.conf /etc/lighttpd/lighttpd.conf
-COPY files/entrypoint.sh /entrypoint.sh
-COPY files/supervisord.conf /etc/supervisord.conf
-
-EXPOSE 8080
-
-VOLUME ["/etc/backuppc", "/home/backuppc", "/data/backuppc"]
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/files/entrypoint.sh b/files/entrypoint.sh
index d85b2b9..0aef891 100755
--- a/files/entrypoint.sh
+++ b/files/entrypoint.sh
@@ -29,10 +29,10 @@ if [ -f /firstrun ]; then
 		--hostname localhost \
 		--html-dir /var/www/html/BackupPC \
 		--html-dir-url /BackupPC \
-		--install-dir /usr/local/BackupPC \
-		--config-override CgiAdminUsers="'${BACKUPPC_WEB_USER:-backuppc}'"
+		--install-dir /usr/local/BackupPC
 
 	# Configure WEB UI access
+	sed -ie "s/^\$Conf{CgiAdminUsers}\s*=\s*'\w*'/\$Conf{CgiAdminUsers} = '${BACKUPPC_WEB_USER:-backuppc}'/g" /etc/backuppc/config.pl
 	htpasswd -b -c /etc/backuppc/htpasswd ${BACKUPPC_WEB_USER:-backuppc} ${BACKUPPC_WEB_PASSWD:-password}
 
 	# Prepare lighttpd