From d26a4e12deafade205d37a9fda748a6b78dfdb6a Mon Sep 17 00:00:00 2001
From: Silvino Silva <silvino@bk.ru>
Date: Sat, 25 Feb 2017 18:40:03 +0000
Subject: overall revesion

---
 tools/conf/etc/rc.d/dnscrypt-proxy |  5 +++--
 tools/dnsmasq.html                 |  7 ++++++-
 tools/gitolite.html                |  3 +--
 tools/index.html                   |  6 ------
 tools/mutt.html                    | 10 +++++++++-
 tools/qemu.html                    | 18 ++++++++++--------
 tools/x.html                       | 28 ++++++++++++++++++----------
 7 files changed, 47 insertions(+), 30 deletions(-)

(limited to 'tools')

diff --git a/tools/conf/etc/rc.d/dnscrypt-proxy b/tools/conf/etc/rc.d/dnscrypt-proxy
index 0874fa6..db8cd77 100755
--- a/tools/conf/etc/rc.d/dnscrypt-proxy
+++ b/tools/conf/etc/rc.d/dnscrypt-proxy
@@ -12,7 +12,7 @@
 # Authors: https://github.com/simonclausen/dnscrypt-autoinstall/graphs/contributors
 # Project site: https://github.com/simonclausen/dnscrypt-autoinstall
 
-USER=nobody
+USER=net
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
 DAEMON=/usr/sbin/dnscrypt-proxy
 NAME=dnscrypt-proxy
@@ -24,7 +24,8 @@ PKEY1=3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A
 case "$1" in
   start)
     echo "Starting $NAME"
-    $DAEMON --daemonize --ephemeral-keys --user=nobody --local-address=127.0.0.1:40 \
+    $DAEMON --daemonize --ephemeral-keys --user=nobody \
+	    --local-address=127.0.0.1:40 \
 	    --resolver-address=$ADDRESS3 \
 	    --provider-name=$PNAME1 \
 	    --provider-key=$PKEY3 \
diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html
index 2aa7b82..720979b 100644
--- a/tools/dnsmasq.html
+++ b/tools/dnsmasq.html
@@ -14,6 +14,11 @@
         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.</p>
 
+        <pre>
+        $ sudo useradd -M -r -s /bin/false -g net net
+        </pre>
+
+
         <h2 id="dnscrypt">1. Dnscrypt</h2>
 
         <pre>
@@ -28,7 +33,7 @@
         nobody user. Basic usage example;</p>
 
         <pre>
-        $ sudo -u nobody  dnscrypt-proxy --daemonize --resolver-name=&lt;resolver name&gt;
+        $ sudo -u net  dnscrypt-proxy --daemonize --resolver-name=&lt;resolver name&gt;
         </pre>
 
         <h2 id="dnsmasq">2. Dnsmasq</h2>
diff --git a/tools/gitolite.html b/tools/gitolite.html
index 94abda0..ab1ad3a 100644
--- a/tools/gitolite.html
+++ b/tools/gitolite.html
@@ -22,8 +22,7 @@
         <p>Create user and home directory;</p>
 
         <pre>
-        # mkdir -p /srv/gitolite
-        # useradd -r -s /bin/bash -m -d /srv/gitolite gitolite
+        # useradd -r -s /bin/bash -U -m -d /srv/gitolite gitolite
         # chown gitolite:gitolite /srv/gitolite
         </pre>
 
diff --git a/tools/index.html b/tools/index.html
index da1cd40..2f84114 100644
--- a/tools/index.html
+++ b/tools/index.html
@@ -68,12 +68,6 @@
         <h2>System Administration</h2>
 
         <ul>
-            <li><a href="hardening.html">Hardening</a>
-                <ul>
-                    <li><a href="grsecurity.html">Grsecurity</a></li>
-                    <li><a href="samhain.html">Samhain</a></li>
-                </ul>
-            </li>
             <li><a href="network.html">Network Tools</a>
                 <ul>
                     <li><a href="dnsmasq.html">Dnscrypt and Dnsmasq</a></li>
diff --git a/tools/mutt.html b/tools/mutt.html
index ef7cdbd..5c72e0c 100644
--- a/tools/mutt.html
+++ b/tools/mutt.html
@@ -162,7 +162,15 @@
 
         <h3 id="system">2.1. System Email</h3>
 
-        <p>Content of <a href="conf/etc/skel/.mutt/system">.mutt/system</a>;</p>
+        <p>Check and point enviroment mail variable to new local maildir;</p>
+
+        <pre>
+        $ echo "MAIL=$HOME/.mail/" >> ~/.bashrc
+        $ source ~/.bashrc
+        $ env | grep MAIL
+        </pre>
+
+        <p>Content of <a href="conf/etc/skel/.mutt/system">.mutt/system</a>;<p>
 
         <pre>
         color status green default
diff --git a/tools/qemu.html b/tools/qemu.html
index 1c58e49..c914d74 100644
--- a/tools/qemu.html
+++ b/tools/qemu.html
@@ -43,22 +43,17 @@
         this describes how to create a qcow2 type;</p>
 
         <pre>
-        $ qemu-img create -f qcow2 crux-img.qcow2 15G
+        $ qemu-img create -f qcow2 crux-img.qcow2 20G
         </pre>
 
-        <p>You can mount disk image;</p>
+        <p>Qemu disk images can be treated as regular disks using
+        qemu disk network block device server;</p>
 
         <pre>
         $ sudo modprobe nbd
         $ sudo qemu-nbd -c /dev/nbd0 /crux-img.qcow2
         </pre>
 
-        <p>To disconnect image disk (ndb);</p>
-
-        <pre>
-        $ sudo qemu-nbd -d /dev/nbd0
-        </pre>
-
         <p>Information about preparing
         <a href="../core/install.html#step2">partitions</a>
         and <a href="storage.html">storage</a> administration.
@@ -100,6 +95,13 @@
         # mount $BLK_VAR $CHROOT/var
         </pre>
 
+        <p>Before disconnecting image, clean dev mappings;</p>
+
+        <pre>
+        $ sudo kpartx -d /dev/nbd0
+        $ sudo qemu-nbd -d /dev/nbd0
+        </pre>
+
         <h2 id="net">2. Network</h2>
 
         <p>Network configuration;</p>
diff --git a/tools/x.html b/tools/x.html
index e01aaca..ad5ea6d 100644
--- a/tools/x.html
+++ b/tools/x.html
@@ -40,6 +40,12 @@
         $ prt-get search xorg-font-bh | xargs sudo prt-get depinst
         </pre>
 
+        <p>From 6c37 collection;</p>
+
+        <pre>
+        $ prt-get depinst otf-sourcecode
+        </pre>
+
         <h2>Configure</h2>
 
         <p>Example of <a href="conf/etc/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
@@ -170,24 +176,26 @@
 
         <h2>Window Managers</h2>
 
-        <h3>Dwm</h3>
 
         <pre>
-        $ sudo prt-get depinst dmenu \
-            dwm \
-            spectrwm \
+        $ sudo prt-get depinst \
+            alsa-utils \
+            libdrm \
+            mesa3d \
+            ffmpeg \
+            gstreamer \
+            gstreamer-vaapi \
+            gst-plugins-base \
+            gst-plugins-good \
+            adwaita-icon-theme \
+            dmenu \
             st \
             conky \
             dillo \
-            adwaita-icon-theme \
+            spectrwm \
             gparted \
             gimp \
             libreoffice \
-            ffmpeg \
-            gstreamer \
-            gstreamer-vaapi \
-            gst-plugins-base \
-            gst-plugins-good \
             epiphany
         </pre>
 
-- 
cgit 1.4.1-2-gfad0