Begin of restructuring ...

- tweaking before re-work tpotinit

docker/tpotinit/Dockerfile

@@ -8,23 +8,24 @@ RUN apk --no-cache -U add \
         aria2 \
         apache2-utils \
         bash \
-	    bind-tools \
+        bind-tools \
         conntrack-tools \
-	    curl \
-	    ethtool \
-	    figlet \
+        curl \
+        ethtool \
+        figlet \
         git \
         grep \
-	    iproute2 \
-	    iptables \
-	    jq \
-	    logrotate \
-	    lsblk \
-	    net-tools \
-	    openssl \
-	    pigz \
-	    tar \
-	    uuidgen && \
+        iproute2 \
+        iptables \
+        iptables-legacy \
+        jq \
+        logrotate \
+        lsblk \
+        net-tools \
+        openssl \
+        pigz \
+        tar \
+        uuidgen && \
     apk --no-cache -U add --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
         yq && \
 #
@@ -33,17 +34,6 @@ RUN apk --no-cache -U add \
     adduser -S -s /bin/ash -u 2000 -D -g 2000 tpot && \
 #
 # Install tpot
-    #sed -i "s#/opt/tpot/etc/logrotate/status#/data/tpot/etc/logrotate/status#g" bin/clean.sh && \
-    #sed -i "s#/opt/tpot/etc/compose/elk_environment#/data/tpot/etc/compose/elk_environment#g" bin/clean.sh && \
-    #sed -i "s#/usr/sbin/iptables-legacy#/sbin/iptables-legacy#g" bin/rules.sh && \
-    #sed -i "s/tr -d '\", '/tr -d '\", ,#,-'/g" bin/rules.sh && \
-    #sed -i "s#/opt/tpot/etc/compose/elk_environment#/data/tpot/etc/compose/elk_environment#g" bin/updateip.sh && \
-    #sed -i "s#.*myLOCALIP=.*#myLOCALIP=\$(/sbin/ip address show | awk '/inet .*brd/{split(\$2,a,\"/\"); print a[1]; exit}')#" bin/updateip.sh && \
-    #sed -i "s#.*myUUID=.*#myUUID=\$(cat /data/uuid)#" bin/updateip.sh && \
-    #sed -i "s#/etc/issue#/tmp/etc/issue#g" bin/updateip.sh && \
-    #sed -i "/toilet/d" bin/updateip.sh && \
-    #sed -i "/source \/etc\/environment/d" bin/updateip.sh && \
-    #touch /opt/tpot/etc/tpot.yml && \
     cp /root/dist/entrypoint.sh . && \
 #
 # Clean up