fix execstack warning, some general tidying of init files etc

Author: sparklyballs

Dockerfile

@@ -14,13 +14,21 @@ RUN \
  apt-key adv --keyserver keyserver.ubuntu.com --recv C0A52C50 && \
  apt-get update && \
  apt-get install -y \
+	execstack \
 	openjdk-8-jre-headless \
 	unifi \
 	wget && \
 
+# fix execstack warning on library
+ execstack -c \
+	/usr/lib/unifi/lib/native/Linux/amd64/libubnt_webrtc_jni.so && \
+
 # cleanup
  apt-get clean && \
- rm -rfv /tmp/* /var/lib/apt/lists/* /var/tmp/*
+ rm -rf \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 # add local files
 COPY root/ /

README.md

@@ -86,6 +86,7 @@ The webui is at https://ip:8443 , setup with the first run wizard.
 
 ## Versions
 
++ **18.03.17:** Fix execstack warning.
 + **14.10.16:** Add version layer information.
 + **20.09.16** Bump to pick up ver 5.27.
 + **10.09.16** Add layer badges to README.

root/etc/cont-init.d/20-config

@@ -1,19 +1,18 @@
 #!/usr/bin/with-contenv bash
 
-mkdir -p /config/{data,logs,run}
-
+# create our folders
+mkdir -p \
+	/config/{data,logs,run}
 
+# create symlinks for config
 [[ -L /usr/lib/unifi/data && ! /usr/lib/unifi/data -ef /config/data ]] && unlink /usr/lib/unifi/data
 [[ -L /usr/lib/unifi/logs && ! /usr/lib/unifi/logs -ef /config/logs ]] && unlink /usr/lib/unifi/logs
 [[ -L /usr/lib/unifi/run && ! /usr/lib/unifi/run -ef /config/run ]] && unlink /usr/lib/unifi/run
-
-
 [[ ! -L /usr/lib/unifi/data ]] && ln -s /config/data /usr/lib/unifi/data
 [[ ! -L /usr/lib/unifi/logs ]] && ln -s /config/logs /usr/lib/unifi/logs
 [[ ! -L /usr/lib/unifi/run ]] && ln -s /config/run /usr/lib/unifi/run
 
-chown -R abc:abc /config /usr/lib/unifi
-
-
-
-
+# permissions
+chown -R abc:abc \
+	/config \
+	/usr/lib/unifi

root/etc/cont-init.d/30-keygen

@@ -1,6 +1,11 @@
 #!/usr/bin/with-contenv bash
 
-[[ ! -f /config/data/keystore ]] &&  keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore -storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 -keysize 4096 -dname "cn=unfi"
-
-chown abc:abc /config/data/keystore
+# generate key
+[[ ! -f /config/data/keystore ]] && \
+	keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
+	-storepass aircontrolenterprise -keypass aircontrolenterprise -validity 1825 \
+	-keysize 4096 -dname "cn=unfi"
 
+# permissions
+chown abc:abc \
+	/config/data/keystore

root/etc/services.d/unifi/run

@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
+
 cd /config || exit
+
 exec \
 	s6-setuidgid abc java -Xmx1024M -jar /usr/lib/unifi/lib/ace.jar start
-