From 2add55a9823687db01d987a112b97294d49dd3a0 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sun, 6 Dec 2015 01:49:18 +0100
Subject: [PATCH] Remove non-functional syslog and logrotate facilities

---
 build/Makefile                |  2 +-
 build/make/base.mk            |  5 ++---
 build/make/logrotate.mk       |  2 --
 build/make/syslog.mk          |  3 ---
 build/runit/syslog            | 18 ------------------
 build/scripts/lighttpd-php.sh | 18 ------------------
 build/scripts/logrotate.sh    |  7 -------
 7 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 build/make/logrotate.mk
 delete mode 100644 build/make/syslog.mk
 delete mode 100644 build/runit/syslog
 delete mode 100644 build/scripts/lighttpd-php.sh
 delete mode 100644 build/scripts/logrotate.sh

diff --git a/build/Makefile b/build/Makefile
index 8b4708e..6b45b24 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -38,7 +38,7 @@ all: build bin service clean
 
 build: prepare base
 	$(call script,cleanup)
-	@echo 'RUN chmod +x /opt/init.d/*' >> ${FILE}
+	@echo 'RUN chmod +x /opt/init.d/* || :' >> ${FILE}
 	@echo 'CMD ["/opt/init"]' >> ${FILE}
 	@docker build -t $(NAME):$(VERSION) $(ARGS) -f $(FILE) $(BASE)
 	@rm ${FILE}
diff --git a/build/make/base.mk b/build/make/base.mk
index 5eb998a..b92a335 100644
--- a/build/make/base.mk
+++ b/build/make/base.mk
@@ -1,5 +1,4 @@
-base: cron syslog sshd
+base: cron sshd
 	$(call script,utilities)
 	$(call script,init)
-	$(call script,runit)
-	$(call script,logrotate)
\ No newline at end of file
+	$(call script,runit)
\ No newline at end of file
diff --git a/build/make/logrotate.mk b/build/make/logrotate.mk
deleted file mode 100644
index 5643790..0000000
--- a/build/make/logrotate.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-logrotate:
-	ln -f $(BASE)/scripts/*_$@.sh build/scripts
\ No newline at end of file
diff --git a/build/make/syslog.mk b/build/make/syslog.mk
deleted file mode 100644
index 782585a..0000000
--- a/build/make/syslog.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-syslog:
-	$(call script,$@)
-	$(call runit,$@)
\ No newline at end of file
diff --git a/build/runit/syslog b/build/runit/syslog
deleted file mode 100644
index fd90f1a..0000000
--- a/build/runit/syslog
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-set -e
-[ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng
-case "x$CONSOLE_LOG_LEVEL" in
-  x[1-8])
-    dmesg -n $CONSOLE_LOG_LEVEL
-    ;;
-  x)
-    ;;
-  *)
-    echo "CONSOLE_LOG_LEVEL is of unaccepted value."
-    ;;
-esac
-if [ ! -e /dev/xconsole ]
-then
-  mknod -m 640 /dev/xconsole p
-fi
-syslog-ng -F -p /var/run/syslog-ng.pid
\ No newline at end of file
diff --git a/build/scripts/lighttpd-php.sh b/build/scripts/lighttpd-php.sh
deleted file mode 100644
index 8051038..0000000
--- a/build/scripts/lighttpd-php.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Environment
-export_env PHP_CONFIG /host/etc/php.ini
-export_env PHP_FCGI_CONFIG /etc/lighttpd/conf-enabled/15-fastcgi-php.conf
-export_env PHP_FCGI_PORT 5555
-export_env PHP_FCGI_CHILDREN 16
-export_env PHP_FCGI_MAX_REQUESTS 2000
-
-## Configuration
-ln -s /etc/lighttpd/conf-available/10-fastcgi.conf /etc/lighttpd/conf-enabled/
-cp /etc/lighttpd/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-enabled/
-sed -i "s,\(\"PHP_FCGI_CHILDREN\"\s*=>\s*\"\).*$,\1$PHP_FCGI_CHILDREN\"\,," $PHP_FCGI_CONFIG
-sed -i "s,\(\"PHP_FCGI_MAX_REQUESTS\"\s*=>\s*\"\).*$,\1$PHP_FCGI_MAX_REQUESTS\"\,," $PHP_FCGI_CONFIG
-sed -i "s,\(\"socket\"\),\"host\" => \"127.0.0.1\"\,\n\t\t\"port\" => $PHP_FCGI_PORT\,\n\t\t#\1," $PHP_FCGI_CONFIG
\ No newline at end of file
diff --git a/build/scripts/logrotate.sh b/build/scripts/logrotate.sh
deleted file mode 100644
index 69eec12..0000000
--- a/build/scripts/logrotate.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-source /build/config
-set -x
-
-## Install logrotate
-apt_get_install_permanent logrotate
\ No newline at end of file