Update examples

Signed-off-by: Laurent Bercot <ska@appnovation.com>

13 files changed, 6 insertions, 18 deletions

diff --git a/examples/source/dns-cache/data/root/ip/127.0.0.1 b/examples/source/dns-cache/data/root/ip/127.0.0.1
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/127.0.0.1
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/ip/192.168.0 b/examples/source/dns-cache/data/root/ip/192.168.0
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/192.168.0
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/ip/192.168.1 b/examples/source/dns-cache/data/root/ip/192.168.1
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/192.168.1
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/ip/192.168.2 b/examples/source/dns-cache/data/root/ip/192.168.2
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/192.168.2
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/ip/192.168.3 b/examples/source/dns-cache/data/root/ip/192.168.3
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/192.168.3
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/ip/192.168.4 b/examples/source/dns-cache/data/root/ip/192.168.4
deleted file mode 100644
index e69de29..0000000
--- a/examples/source/dns-cache/data/root/ip/192.168.4
+++ /dev/null
diff --git a/examples/source/dns-cache/data/root/servers/168.192.in-addr.arpa b/examples/source/dns-cache/data/root/servers/168.192.in-addr.arpa
deleted file mode 120000
index caa12a8..0000000
--- a/examples/source/dns-cache/data/root/servers/168.192.in-addr.arpa
+++ /dev/null
@@ -1 +0,0 @@
-example.com
\ No newline at end of file
diff --git a/examples/source/dns-cache/data/root/servers/@ b/examples/source/dns-cache/data/root/servers/@
deleted file mode 100644
index ca40b38..0000000
--- a/examples/source/dns-cache/data/root/servers/@
+++ /dev/null
@@ -1,13 +0,0 @@
-198.41.0.4
-192.228.79.201
-192.33.4.12
-128.8.10.90
-192.203.230.10
-192.5.5.241
-192.112.36.4
-128.63.2.53
-192.36.148.17
-192.58.128.30
-193.0.14.129
-199.7.83.42
-202.12.27.33
diff --git a/examples/source/dns-cache/data/root/servers/example.com b/examples/source/dns-cache/data/root/servers/example.com
deleted file mode 100644
index 0c4b6f6..0000000
--- a/examples/source/dns-cache/data/root/servers/example.com
+++ /dev/null
@@ -1 +0,0 @@
-192.168.1.1
diff --git a/examples/source/dns-cache/dependencies b/examples/source/dns-cache/dependencies
index 6daf05b..112b3f2 100644
--- a/examples/source/dns-cache/dependencies
+++ b/examples/source/dns-cache/dependencies
@@ -1 +1,2 @@
+init-urandom
 init-lan
diff --git a/examples/source/dns-cache/down-signal b/examples/source/dns-cache/down-signal
new file mode 100644
index 0000000..dc1b980
--- /dev/null
+++ b/examples/source/dns-cache/down-signal
@@ -0,0 +1 @@
+SIGTERM
diff --git a/examples/source/dns-cache/env/ROOT b/examples/source/dns-cache/env/ROOT
index d4dba8d..fbf51ea 100644
--- a/examples/source/dns-cache/env/ROOT
+++ b/examples/source/dns-cache/env/ROOT
@@ -1 +1 @@
-/run/service/dns-cache/data/root
+/home/dns/cache-root
diff --git a/examples/source/dns-cache/run b/examples/source/dns-cache/run
index 8aa7e3b..086002f 100755
--- a/examples/source/dns-cache/run
+++ b/examples/source/dns-cache/run
@@ -1,8 +1,9 @@
 #!/command/execlineb -P
 fdmove -c 2 1
 s6-envuidgid dnscache
+s6-envdir /etc/env-network
 s6-envdir env
-importas ETH0_IP4 ETH0_IP4
+importas -u ETH0_IP4 ETH0_IP4
 export IP ${ETH0_IP4}
 s6-softlimit -m 4000000
 pipeline -d
@@ -10,5 +11,5 @@ pipeline -d
   redirfd -r 0 /dev/urandom
   s6-head -c 128
 }
-unexport LASTPID
+unexport !
 dnscache