network name revision

3 files changed, 18 insertions, 21 deletions

diff --git a/host.html b/host.html
index 01aaf4f..35d0d7c 100644
--- a/host.html
+++ b/host.html
@@ -26,6 +26,7 @@
             <dt>Hostname</dt>
             <dd>c9</dd>
             <dd><a href="core/configure.html#hostname">Hostname</a></dd>
+            <dd><a href="core/exim.html#cert">Exim certificates</a></dd>
         </dl>
 
         <h2>Network</h2>
@@ -48,23 +49,19 @@
             <a href="core/network.html#iptables">iptables</a> with help
             of <a href="core/script/iptables.sh">iptables.sh</a> script.</dd>
 
+            <dt>FQDN</dt>
+
+            <dd>core.privat-server.net</dd>
+            <dd><a href="tools/gpg.html#genkey">GPG certificates</a></dd>
+            <dd><a href="tools/network.html#dnsmasq">Dnsmasq</a></dd>
+            <dd><a href="tools/nginx.html">Nginx</a></dd>
+
             <dt>Access Point/Router</dt>
 
             <dd>Wireless interface <a href="tools/wireless.html">handle access point</a>.
             </dd>
             <dd><a href="tools/hostapd.html">Access Point</a></dd>
 
-            <dt>FQDN</dt>
-
-            <dd>core.privat-server.net</dd>
-            <dd><a href="core/configure.html#hostname">Hostname</a></dd>
-            <dd><a href="core/exim.html#cert">Exim certificates</a></dd>
-            <dd><a href="tools/network.html#dnsmasq">Dnsmasq</a></dd>
-            <dd><a href="tools/gpg.html#genkey">GPG certificates</a></dd>
-
-            <dt>DNS</dt>
-            <dd><a href="tools/network.html#dnscrypt">Dns encryption</a></dd>
-            <dd><a href="tools/network.html#dnsmasq">Dns cache</a></dd>
         </dl>
 
         <h2>DevOps</h2>
diff --git a/tools/openssh.html b/tools/openssh.html
index ca504b2..3fe72e3 100644
--- a/tools/openssh.html
+++ b/tools/openssh.html
@@ -199,8 +199,8 @@
         <p>If the server is on remote a remote machine;</p>
 
         <pre>
-        $ scp /home/bob/.ssh/gitolite.pub admin@nark.biz.tm:/home/admin/.ssh/
-        bob@nark.biz.tm's password:
+        $ scp /home/bob/.ssh/gitolite.pub admin@core.privat-network.net:/home/admin/.ssh/
+        bob@core.privat-network.net's password:
         gitolite.pub                              100%  390     0.4KB/s   00:00
         </pre>
 
@@ -223,25 +223,25 @@
 
         <pre>
         Host admin
-            Hostname nark.biz.tm
+            Hostname core.privat-network.net
             IdentityFile ~/.ssh/id_rsa
             Port 2222
             User admin
 
         Host gitolite
-            Hostname nark.biz.tm
+            Hostname core.privat-network.net
             IdentityFile ~/.ssh/gitolite
             Port 2222
             User gitolite
 
         Host box
-            Hostname nark.biz.tm
+            Hostname core.privat-network.net
             IdentityFile ~/.ssh/id_rsa
             Port 2222
             User bob
 
         Host devbox
-            Hostname nark.biz.tm
+            Hostname core.privat-network.net
             IdentityFile ~/.ssh/id_rsa
             Port 2222
             User gitolite
diff --git a/tools/squid.html b/tools/squid.html
index 363edba..f34c2dd 100644
--- a/tools/squid.html
+++ b/tools/squid.html
@@ -22,17 +22,17 @@ http://roberts.bplaced.net/index.php/linux-guides/centos-6-guides/proxy-server/s
 
         <pre>
 # Generate Private Key
-openssl genrsa -out c13.libernodus.com.key 2048
+openssl genrsa -out core.privat-network.net.key 2048
         </pre>
 
         <pre>
 # Create Certificate Signing Request
-openssl req -new -key c13.libernodus.com.key -out c13.libernodus.com.csr 
+openssl req -new -key core.privat-network.net.key -out core.privat-network.net.csr 
         </pre>
 
         <pre>
 # Sign Certificate
-openssl x509 -req -days 3652 -in c13.libernodus.com.csr -signkey c13.libernodus.com.key -out c13.libernodus.com.cert
+openssl x509 -req -days 3652 -in core.privat-network.net.csr -signkey core.privat-network.net.key -out core.privat-network.net.cert
 cat squid.key squid.crt > squid.pem
 
 
@@ -56,7 +56,7 @@ chown -R squid.squid /var/lib/ssl_db
 # Proxy Aware (non-intercepted traffic)
 http_port 192.168.0.1:3128 ssl-bump cert=/etc/squid/example.com.cert key=/etc/squid/example.com.private generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE  
 # Intercepted Traffic
-https_port 192.168.0.1:3130 cert=/etc/squid/ssl/c13.libernodus.com.cert key=/etc/squid/c13.libernodus.com.key ssl-bump intercept generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE
+https_port 192.168.0.1:3130 cert=/etc/squid/ssl/core.privat-network.net.cert key=/etc/squid/core.privat-network.net.key ssl-bump intercept generate-host-certificates=on version=1 options=NO_SSLv2,NO_SSLv3,SINGLE_DH_USE
 
 
 # SSL Bump Config