Merge branch 'f-core-net' into develop

5 files changed, 56 insertions, 48 deletions

diff --git a/core/conf/hosts b/core/conf/hosts
index 2fb89fb..5c64924 100644
--- a/core/conf/hosts
+++ b/core/conf/hosts
@@ -3,10 +3,10 @@
 #
 
 # IPv4
-127.0.0.1	localhost c9
+127.0.0.1	localhost.localdomain localhost c9
 
 #<ip-address>	<hostname.domain.org>	<aliases>
-#192.168.1.9	c9.example.org
+10.0.0.1	core.privat-network.net c9.core
 
 # IPv6
 #::1		ip6-localhost	ip6-loopback
diff --git a/core/conf/rc.d/net b/core/conf/rc.d/net
index d111a25..117667b 100755
--- a/core/conf/rc.d/net
+++ b/core/conf/rc.d/net
@@ -9,9 +9,9 @@ TYPE="static"
 # For "static" connections, specify your settings here:
 # To see your available devices run "ip link".
 DEV=enp8s0
-ADDR=192.168.1.33
+ADDR=10.0.0.1
 MASK=24
-GW=192.168.1.1
+GW=10.0.0.1
 
 # Optional settings:
 DHCPOPTS="-h $(/bin/hostname) -C resolv.conf $DEV"
diff --git a/core/configure.html b/core/configure.html
index 724b12f..f604f9c 100644
--- a/core/configure.html
+++ b/core/configure.html
@@ -59,14 +59,21 @@
         with core.privat-server.net pointing to c9 host;</p>
 
         <pre>
-        #
-        # /etc/hosts: static lookup table for host names
-        #
-
         # IPv4
-        127.0.0.1	localhost c9
-        #<ip-address>	<hostname.domain.org>	<aliases>
-        # 192.168.1.9	core.privat-server.net
+        127.0.0.1	localhost.localdomain localhost c9
+
+        #&lt;ip-address&gt;	&lt;hostname.domain.org&gt;	&lt;aliases&gt;
+        10.0.0.1	core.privat-network.net c9.core
+
+        # IPv6
+        #::1		ip6-localhost	ip6-loopback
+        #fe00::0	ip6-localnet
+        #ff00::0	ip6-mcastprefix
+        #ff02::1	ip6-allnodes
+        #ff02::2	ip6-allrouters
+        #ff02::3	ip6-allhosts
+
+        # End of file
         </pre>
 
         <h2 id="time">1.2.2. Set timezone</h2>
diff --git a/core/index.html b/core/index.html
index 1200ca6..d3eff38 100644
--- a/core/index.html
+++ b/core/index.html
@@ -72,9 +72,9 @@
         <ul>
             <li><a href="network.html">2.1. Network</a>
                 <ul>
-                    <li><a href="network.html#iptables">2.1.1. Iptables</a></li>
-                    <li><a href="network.html#resolv">2.1.2. Resolver</a></li>
-                    <li><a href="network.html#static">2.1.3. Static ip</a></li>
+                    <li><a href="network.html#resolv">2.1.1. Resolver</a></li>
+                    <li><a href="network.html#static">2.1.2. Static ip</a></li>
+                    <li><a href="network.html#iptables">2.1.3. Iptables</a></li>
                     <li><a href="network.html#wpa">2.1.4. Wpa and dhcpd</a></li>
                     <li><a href="network.html#sysctl">2.1.5. Sysctl</a></li>
                 </ul>
diff --git a/core/network.html b/core/network.html
index 04f1266..9f2477e 100644
--- a/core/network.html
+++ b/core/network.html
@@ -27,7 +27,41 @@
 	one of above described scripts then proceed to upgrade your
 	system.</p>
 
-	<h2 id="iptables">2.1.1. Iptables</h2>
+        <h2 id="resolv">2.1.1. Resolver</h2>
+
+        <p>Configure your resolver with a server that don't censorship there for
+        respect your freedom and privacy. Read
+        <a href="https://trac.torproject.org/projects/tor/wiki/doc/DnsResolver/PublicDnsResolvers#PublicDNSServers">Tor Dns Resolver</a>
+        for more information. This example will use
+        <a href="http://www.chaoscomputerclub.de/en/censorship/dns-howto">Chaos Computer Club</a>
+        server, edit /etc/resolv.conf and make it immutable;</p>
+
+        <pre>
+        # /etc/resolv.conf.head can replace this line
+        nameserver 213.73.91.35
+        # /etc/resolv.conf.tail can replace this line
+        </pre>
+
+        <pre>
+        # chattr +i /etc/resolv.conf
+        </pre>
+
+        <h2 id="static">2.1.2. Static IP</h2>
+
+        <pre>
+        # ip link
+        # ip addr flush dev ${DEV}
+        # ip route flush dev ${DEV}
+        </pre>
+
+        <pre>
+        # ip addr add ${ADDR}/${MASK} dev ${DEV} broadcast +
+        # ip link set ${DEV} up
+        # ip route add default via ${GW}
+        </pre>
+
+
+	<h2 id="iptables">2.1.3. Iptables</h2>
 
         <p>For more information about iptables read
         <a href="https://wiki.archlinux.org/index.php/Iptables">arch wiki</a>.
@@ -65,39 +99,6 @@
         </pre>
 
         <p>
-        <h2 id="resolv">2.1.2. Resolver</h2>
-
-        <p>Configure your resolver with a server that don't censorship there for
-        respect your freedom and privacy. Read
-        <a href="https://trac.torproject.org/projects/tor/wiki/doc/DnsResolver/PublicDnsResolvers#PublicDNSServers">Tor Dns Resolver</a>
-        for more information. This example will use
-        <a href="http://www.chaoscomputerclub.de/en/censorship/dns-howto">Chaos Computer Club</a>
-        server, edit /etc/resolv.conf and make it immutable;</p>
-
-        <pre>
-        # /etc/resolv.conf.head can replace this line
-        nameserver 213.73.91.35
-        # /etc/resolv.conf.tail can replace this line
-        </pre>
-
-        <pre>
-        # chattr +i /etc/resolv.conf
-        </pre>
-
-        <h2 id="static">2.1.3. Static IP</h2>
-
-        <pre>
-        # ip link
-        # ip addr flush dev ${DEV}
-        # ip route flush dev ${DEV}
-        </pre>
-
-        <pre>
-        # ip addr add ${ADDR}/${MASK} dev ${DEV} broadcast +
-        # ip link set ${DEV} up
-        # ip route add default via ${GW}
-        </pre>
-
 
         <h2 id="wpa">2.1.4. Wpa and dhcpd</h2>