fixed copying missing config file script. cron is now configurable.

Author: ericp1337

Dockerfile

@@ -12,6 +12,7 @@ ENV BURP_VERSION="1.4.40"
 
 ADD init/ /etc/my_init.d/
 ADD service/ /etc/service/
+ADD cron.d/ /etc/cron.d/
 RUN chmod -v +x /etc/service/*/run /etc/my_init.d/*.sh
 
 RUN useradd -u 911 -U -d /config -s /bin/false abc && \
@@ -37,9 +38,9 @@ ENV PATH=$PATH:/app/usr/sbin
 
 RUN sed -i 's/^directory =.*/directory = \/data/g' /defaults/burp-server.conf && \
       sed -i 's/\/etc\/burp/\/config/g' /defaults/burp-server.conf && \
-      sed -i 's/^stdout =.*/stdout = 1/g' /defaults/burp-server.conf && \
       sed -i 's/\/usr\/sbin/\/app\/usr\/sbin/g' /defaults/burp-server.conf && \
-      sed -i 's/\/etc\/burp/\/config/g' /defaults/CA.cnf
+      sed -i 's/\/etc\/burp/\/config/g' /defaults/CA.cnf && \
+      sed -i 's/^pidfile =.*/pidfile = \/app\/burp.server.pid/g' /defaults/burp-server.conf
 
 RUN sed -i 's/^directory =.*/directory = \/data/g' /defaults/burp.conf && \
       sed -i 's/\/etc\/burp/\/config/g' /defaults/burp.conf && \

README.md

@@ -1,6 +1,6 @@
 # computerfr33k/docker-burp-backup-server
 
-(description)
+[Burp](http://burp.grke.org/) is a network backup and restore program. It attempts to reduce network traffic and the amount of space that is used by each backup.
 
 ## Usage
 
@@ -20,8 +20,11 @@ docker create \
 * `-v /etc/localtime` for timesync - *optional*
 * `-v /config` - Configuration file location
 * `-v /data` - Location for backups
-* `-e PGID` for for GroupID - see below for explanation - *optional*
-* `-e PUID` for for UserID - see below for explanation - *optional*
+* `-e PGID` for GroupID - see below for explanation - *optional*
+* `-e PUID` for UserID - see below for explanation - *optional*
+* `-e ENABLE_CRON_SUMMARY` - Enables emailing a daily summary *optional*
+* `-e BURP_EMAIL` - Sets the email address to send the daily summary to. *only required if cron summary is enabled*
+* `-e DISABLE_CRON_DEDUP` - Disable running dedup once a week over client storage *optional*
 
 It is based on phusion-baseimage with ssh removed, for shell access whilst the container is running do `docker exec -it burp-server /bin/bash`.
 

cron.d/bedup

@@ -0,0 +1,11 @@
+MAILTO="$BURP_EMAIL"
+# Put this file in /etc/cron.d and uncomment the following line to send a
+# summary at 6 every morning.
+# If your server is using a different config file to /etc/burp/burp-server.conf,
+# change the first argument to its path.
+#0 6 * * *       abc    /config/send_summary /config/burp-server.conf $BURP_EMAIL "Daily backup summary"
+
+# The following will run file deduplication over all client storages every
+# Saturday at 8 in the morning. Again, if your server is using a different
+# config file to /etc/burp/burp-server.conf, change that argument.
+0 8 * * 6	abc    /app/usr/sbin/bedup -l -c /config/burp-server.conf >> /app/burp-bedup 2>&1

init/30_check_config.sh

@@ -10,7 +10,7 @@ function isDirEmpty {
 }
 
 function createIfMissing {
-    if [ -f "/config/$1" ]
+    if [ ! -f "/config/$1" ]
     then
         cp /defaults/$1 /config/$1
         chown -R abc:abc /config/$1

init/90_cron.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+if [ -n "$ENABLE_CRON_SUMMARY" ]
+then
+    if [ $ENABLE_CRON_SUMMARY == 1 ]
+    then
+        sed -i '6s/^#//' /etc/cron.d/bedup
+    fi
+else
+    sed -i '6s/\([^#]\)/#\1/' /etc/cron.d/bedup
+fi
+
+if [ "$DISABLE_CRON_DEDUP" ]
+then
+    sed -i '11s/\([^#]\)/#\1/' /etc/cron.d/bedup
+else
+    sed -i '11s/^#//' /etc/cron.d/bedup
+fi

service/burp-server/run

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec /sbin/setuser abc /usr/sbin/burp -c /config/burp-server.conf -F
+exec /sbin/setuser abc /app/usr/sbin/burp -c /config/burp-server.conf -F