Browse Source

removed unsed vars files; wait 5secs for database and recursor before running

tags/v1.1.0^0
Robin Thoni 7 years ago
parent
commit
c794032a40
5 changed files with 2 additions and 44 deletions
  1. 0
    4
      pdns-recursor/Dockerfile
  2. 0
    26
      pdns-recursor/run.sh
  3. 0
    2
      pdns-recursor/vars-files
  4. 0
    12
      pdns-recursor/vars-vars
  5. 2
    0
      pdns/run.sh

+ 0
- 4
pdns-recursor/Dockerfile View File

@@ -12,10 +12,6 @@ RUN rm -rf /var/log/*
12 12
 
13 13
 COPY ./config/ /etc/powerdns/
14 14
 
15
-COPY ./vars-vars /etc/vars-vars
16
-
17
-COPY ./vars-files /etc/vars-files
18
-
19 15
 COPY ./run.sh /run.sh
20 16
 
21 17
 EXPOSE 53/udp

+ 0
- 26
pdns-recursor/run.sh View File

@@ -1,29 +1,3 @@
1 1
 #! /usr/bin/env bash
2 2
 
3
-replace_var()
4
-{
5
-  file="${1}"
6
-  var="${2}"
7
-  sed -e "s?${var}?${!var}?g" -i "${file}"
8
-}
9
-
10
-replace_vars()
11
-{
12
-  file="${1}"
13
-  for var in $(cat /etc/vars-vars)
14
-  do
15
-    replace_var "${file}" "${var}"
16
-  done
17
-}
18
-
19
-replace_files()
20
-{
21
-  for file in $(cat /etc/vars-files)
22
-  do
23
-    replace_vars "${file}"
24
-  done
25
-}
26
-
27
-replace_files
28
-
29 3
 pdns_recursor --daemon=no

+ 0
- 2
pdns-recursor/vars-files View File

@@ -1,2 +0,0 @@
1
-/etc/powerdns/pdns.d/pdns.local.gpgsql.conf
2
-/etc/powerdns/pdns.conf

+ 0
- 12
pdns-recursor/vars-vars View File

@@ -1,12 +0,0 @@
1
-POSTGRES_HOST
2
-POSTGRES_USER
3
-POSTGRES_PASSWORD
4
-POSTGRES_DB
5
-
6
-PDNS_RECURSOR_HOST
7
-
8
-SESSION_KEY
9
-
10
-DNS_HOSTMASTER
11
-DNS_NS1
12
-DNS_NS2

+ 2
- 0
pdns/run.sh View File

@@ -1,5 +1,7 @@
1 1
 #! /usr/bin/env bash
2 2
 
3
+sleep 5
4
+
3 5
 export PDNS_RECURSOR_HOST="$(getent hosts ${PDNS_RECURSOR_HOST} | cut -d' ' -f1)"
4 6
 
5 7
 replace_var()

Loading…
Cancel
Save