From 17fd417d521f21fb0ba8a89ada19d59eb5183376 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Wed, 27 Nov 2019 22:56:42 +0100
Subject: [PATCH] disable rndc stuff for the moment

---
 .gitlab-ci.yml | 3 ++-
 Dockerfile     | 1 -
 yadynns.sh     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc88a5f..a295f12 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,8 @@ build:
                 - docker
         script:
                 - VERSION=`cat VERSION`
-                - docker build --tag $IMAGE_NAME:$VERSION .
+                - docker build --tag $IMAGE_NAME:$VERSION --tag $IMAGE_NAME:latest .
                 - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
                 - docker push $IMAGE_NAME:$VERSION
+                - docker push $IMAGE_NAME:latest
 
diff --git a/Dockerfile b/Dockerfile
index cd53e16..48d271a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,6 @@ RUN \
   apt install -y netcat && \
   echo "include \"/etc/bind/local.key\";" >> /etc/bind/named.conf && \
   echo "include \"/etc/bind/dynamic/dynamic-zones.conf\";" >> /etc/bind/named.conf && \
-  echo "include \"/etc/bind/named.conf.rndc\";" >> /etc/bind/named.conf && \
   echo "include \"/etc/bind/named.conf.logging\";" >> /etc/bind/named.conf 
 
 COPY ./server/ $APP_DIR
diff --git a/yadynns.sh b/yadynns.sh
index 1e64615..a78591f 100755
--- a/yadynns.sh
+++ b/yadynns.sh
@@ -5,10 +5,10 @@ echo "Generating tsig key ..."
 KEY=`cat /etc/bind/local.key | awk -F\" '/secret/ {print $2}'`
 sed -i "s,KEYVALUE,$KEY," /opt/app/yadyn
 
-echo "Generating rndc key ..."
-/usr/sbin/rndc-confgen > /etc/bind/rndc.conf
-KEY=`cat /etc/bind/rndc.conf | egrep "^\s*secret" | awk -F\" '{print $2}'`
-sed -i "s,RNDCKEY,$KEY," /etc/bind/named.conf.rndc
+# echo "Generating rndc key ..."
+# /usr/sbin/rndc-confgen > /etc/bind/rndc.conf
+# KEY=`cat /etc/bind/rndc.conf | egrep "^\s*secret" | awk -F\" '{print $2}'`
+# sed -i "s,RNDCKEY,$KEY," /etc/bind/named.conf.rndc
 
 echo "Starting named ..."
 /usr/sbin/named