linux tools configs moved to linux folder

52 files changed, 29 insertions, 108 deletions

diff --git a/tools/conf/etc/X11/xinit/xinitrc b/linux/conf/X11/xinit/xinitrc
index 2607046..2607046 100644
--- a/tools/conf/etc/X11/xinit/xinitrc
+++ b/linux/conf/X11/xinit/xinitrc
diff --git a/tools/conf/etc/X11/xorg.conf.d/10-keyboard.conf b/linux/conf/X11/xorg.conf.d/10-keyboard.conf
index d8b99b3..d8b99b3 100644
--- a/tools/conf/etc/X11/xorg.conf.d/10-keyboard.conf
+++ b/linux/conf/X11/xorg.conf.d/10-keyboard.conf
diff --git a/tools/conf/etc/X11/xorg.conf.d/50-synaptics.conf b/linux/conf/X11/xorg.conf.d/50-synaptics.conf
index 9fbb829..9fbb829 100644
--- a/tools/conf/etc/X11/xorg.conf.d/50-synaptics.conf
+++ b/linux/conf/X11/xorg.conf.d/50-synaptics.conf
diff --git a/tools/conf/etc/asound.conf b/linux/conf/asound.conf
index adbae67..adbae67 100644
--- a/tools/conf/etc/asound.conf
+++ b/linux/conf/asound.conf
diff --git a/tools/conf/etc/dnsmasq.conf b/linux/conf/dnsmasq.conf
index b6267fa..b6267fa 100644
--- a/tools/conf/etc/dnsmasq.conf
+++ b/linux/conf/dnsmasq.conf
diff --git a/tools/conf/etc/fonts/local.conf b/linux/conf/fonts/local.conf
index 64dc276..64dc276 100644
--- a/tools/conf/etc/fonts/local.conf
+++ b/linux/conf/fonts/local.conf
diff --git a/tools/conf/etc/gitweb.conf b/linux/conf/gitweb.conf
index 2f95792..2f95792 100644
--- a/tools/conf/etc/gitweb.conf
+++ b/linux/conf/gitweb.conf
diff --git a/tools/conf/etc/hosts.dnsmasq b/linux/conf/hosts.dnsmasq
index b4d0b07..b4d0b07 100644
--- a/tools/conf/etc/hosts.dnsmasq
+++ b/linux/conf/hosts.dnsmasq
diff --git a/tools/conf/etc/logrotate.conf b/linux/conf/logrotate.conf
index d7ff75c..d7ff75c 100644
--- a/tools/conf/etc/logrotate.conf
+++ b/linux/conf/logrotate.conf
diff --git a/tools/conf/etc/logrotate.d/fail2ban b/linux/conf/logrotate.d/fail2ban
index c2dc4cd..c2dc4cd 100644
--- a/tools/conf/etc/logrotate.d/fail2ban
+++ b/linux/conf/logrotate.d/fail2ban
diff --git a/tools/conf/etc/logrotate.d/letsencrypt b/linux/conf/logrotate.d/letsencrypt
index ce73ebc..ce73ebc 100644
--- a/tools/conf/etc/logrotate.d/letsencrypt
+++ b/linux/conf/logrotate.d/letsencrypt
diff --git a/tools/conf/etc/logrotate.d/lynis b/linux/conf/logrotate.d/lynis
index 8cf9181..8cf9181 100644
--- a/tools/conf/etc/logrotate.d/lynis
+++ b/linux/conf/logrotate.d/lynis
diff --git a/tools/conf/etc/logrotate.d/ntp b/linux/conf/logrotate.d/ntp
index c46b590..c46b590 100644
--- a/tools/conf/etc/logrotate.d/ntp
+++ b/linux/conf/logrotate.d/ntp
diff --git a/tools/conf/etc/logrotate.d/postgresql b/linux/conf/logrotate.d/postgresql
index 8c16bfa..8c16bfa 100644
--- a/tools/conf/etc/logrotate.d/postgresql
+++ b/linux/conf/logrotate.d/postgresql
diff --git a/tools/conf/etc/logrotate.d/samhain b/linux/conf/logrotate.d/samhain
index d60f810..d60f810 100644
--- a/tools/conf/etc/logrotate.d/samhain
+++ b/linux/conf/logrotate.d/samhain
diff --git a/tools/conf/etc/logrotate.d/shorewall b/linux/conf/logrotate.d/shorewall
index a7dffdf..a7dffdf 100644
--- a/tools/conf/etc/logrotate.d/shorewall
+++ b/linux/conf/logrotate.d/shorewall
diff --git a/tools/conf/etc/logrotate.d/shorewall6 b/linux/conf/logrotate.d/shorewall6
index ee5e246..ee5e246 100644
--- a/tools/conf/etc/logrotate.d/shorewall6
+++ b/linux/conf/logrotate.d/shorewall6
diff --git a/tools/conf/etc/nginx/conf.d/10-default.conf b/linux/conf/nginx/conf.d/10-default.conf
index 97ee31b..97ee31b 100644
--- a/tools/conf/etc/nginx/conf.d/10-default.conf
+++ b/linux/conf/nginx/conf.d/10-default.conf
diff --git a/tools/conf/etc/nginx/nginx.conf b/linux/conf/nginx/nginx.conf
index e757df6..e757df6 100644
--- a/tools/conf/etc/nginx/nginx.conf
+++ b/linux/conf/nginx/nginx.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/default.conf b/linux/conf/nginx/sites-enabled/default.conf
index f7a6928..f7a6928 100644
--- a/tools/conf/etc/nginx/sites-enabled/default.conf
+++ b/linux/conf/nginx/sites-enabled/default.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/email.conf b/linux/conf/nginx/sites-enabled/email.conf
index 5b34d7c..5b34d7c 100644
--- a/tools/conf/etc/nginx/sites-enabled/email.conf
+++ b/linux/conf/nginx/sites-enabled/email.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/forum.conf b/linux/conf/nginx/sites-enabled/forum.conf
index 14350e3..14350e3 100644
--- a/tools/conf/etc/nginx/sites-enabled/forum.conf
+++ b/linux/conf/nginx/sites-enabled/forum.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/frontpage.conf b/linux/conf/nginx/sites-enabled/frontpage.conf
index 7f7e66a..7f7e66a 100644
--- a/tools/conf/etc/nginx/sites-enabled/frontpage.conf
+++ b/linux/conf/nginx/sites-enabled/frontpage.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/git.conf b/linux/conf/nginx/sites-enabled/git.conf
index f9d2d97..f9d2d97 100644
--- a/tools/conf/etc/nginx/sites-enabled/git.conf
+++ b/linux/conf/nginx/sites-enabled/git.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/ports.conf b/linux/conf/nginx/sites-enabled/ports.conf
index 829d710..829d710 100644
--- a/tools/conf/etc/nginx/sites-enabled/ports.conf
+++ b/linux/conf/nginx/sites-enabled/ports.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/shop.conf b/linux/conf/nginx/sites-enabled/shop.conf
index de34e40..de34e40 100644
--- a/tools/conf/etc/nginx/sites-enabled/shop.conf
+++ b/linux/conf/nginx/sites-enabled/shop.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/task.conf b/linux/conf/nginx/sites-enabled/task.conf
index 8b15ee5..8b15ee5 100644
--- a/tools/conf/etc/nginx/sites-enabled/task.conf
+++ b/linux/conf/nginx/sites-enabled/task.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/vexim.conf b/linux/conf/nginx/sites-enabled/vexim.conf
index d113cdc..d113cdc 100644
--- a/tools/conf/etc/nginx/sites-enabled/vexim.conf
+++ b/linux/conf/nginx/sites-enabled/vexim.conf
diff --git a/tools/conf/etc/nginx/sites-enabled/wiki.conf b/linux/conf/nginx/sites-enabled/wiki.conf
index 1e3b4d1..1e3b4d1 100644
--- a/tools/conf/etc/nginx/sites-enabled/wiki.conf
+++ b/linux/conf/nginx/sites-enabled/wiki.conf
diff --git a/tools/conf/etc/nginx/sites/default.conf b/linux/conf/nginx/sites/default.conf
index dcb076f..dcb076f 100644
--- a/tools/conf/etc/nginx/sites/default.conf
+++ b/linux/conf/nginx/sites/default.conf
diff --git a/tools/conf/etc/nginx/sites/drupal.conf b/linux/conf/nginx/sites/drupal.conf
index f79ed14..f79ed14 100644
--- a/tools/conf/etc/nginx/sites/drupal.conf
+++ b/linux/conf/nginx/sites/drupal.conf
diff --git a/tools/conf/etc/nginx/sites/flyspray.conf b/linux/conf/nginx/sites/flyspray.conf
index ba174f1..ba174f1 100644
--- a/tools/conf/etc/nginx/sites/flyspray.conf
+++ b/linux/conf/nginx/sites/flyspray.conf
diff --git a/tools/conf/etc/nginx/sites/laravel.conf b/linux/conf/nginx/sites/laravel.conf
index addfd18..addfd18 100644
--- a/tools/conf/etc/nginx/sites/laravel.conf
+++ b/linux/conf/nginx/sites/laravel.conf
diff --git a/linux/conf/rc.conf b/linux/conf/rc.conf
index 6780fc3..267cdd4 100644
--- a/linux/conf/rc.conf
+++ b/linux/conf/rc.conf
@@ -5,8 +5,8 @@
 FONT=default
 KEYMAP=dvorak
 TIMEZONE="Europe/Lisbon"
-HOSTNAME=machine
-SYSLOG=sysklogd
-SERVICES=(lo iptables net crond)
+HOSTNAME=crux
+SYSLOG=syslog-ng
+SERVICES=(apparmor lo net iptables sshd ntpd postgresql exim dovecot git-daemon php-fpm fcgiwrap nginx crond)
 
 # End of file
diff --git a/tools/conf/etc/rc.d/blan b/linux/conf/rc.d/blan
index 61ac2d6..61ac2d6 100755
--- a/tools/conf/etc/rc.d/blan
+++ b/linux/conf/rc.d/blan
diff --git a/tools/conf/etc/rc.d/dnscrypt-proxy b/linux/conf/rc.d/dnscrypt-proxy
index db8cd77..db8cd77 100755
--- a/tools/conf/etc/rc.d/dnscrypt-proxy
+++ b/linux/conf/rc.d/dnscrypt-proxy
diff --git a/linux/conf/rc.d/git-daemon b/linux/conf/rc.d/git-daemon
index 41793eb..fc43cbf 100755
--- a/linux/conf/rc.d/git-daemon
+++ b/linux/conf/rc.d/git-daemon
@@ -3,7 +3,7 @@
 SSD=/sbin/start-stop-daemon
 NAME=git-daemon
 PROG=$(git --exec-path)/${NAME}
-USER=gitolite
+USER=www
 GROUP=gitolite
 PIDFILE=/var/run/git-daemon.pid
 REPOS=/srv/gitolite/repositories
diff --git a/tools/conf/etc/rc.d/syslog-ng b/linux/conf/rc.d/syslog-ng
index 4ccc7f8..4ccc7f8 100755
--- a/tools/conf/etc/rc.d/syslog-ng
+++ b/linux/conf/rc.d/syslog-ng
diff --git a/linux/conf/resolv.conf b/linux/conf/resolv.conf
index 4c22142..b568a6c 100644
--- a/linux/conf/resolv.conf
+++ b/linux/conf/resolv.conf
@@ -1,8 +1,9 @@
-#
-# /etc/resolv.conf: resolver configuration file
-#
-
-#search <domain.org>
-#nameserver <ip-address>
-nameserver 213.73.91.35
-# End of file
+# Generated by dhcpcd from wlp7s0.dhcp
+# /etc/resolv.conf.head can replace this line
+nameserver 127.0.0.1
+# CCC server
+# nameserver 213.73.91.35
+# OpenNIC Servers
+# nameserver 192.71.249.83
+# nameserver 5.135.183.146
+# /etc/resolv.conf.tail can replace this line
diff --git a/tools/conf/etc/ssh/sshd_config b/linux/conf/ssh/sshd_config
index 495d183..495d183 100644
--- a/tools/conf/etc/ssh/sshd_config
+++ b/linux/conf/ssh/sshd_config
diff --git a/tools/conf/etc/syslog-ng.conf b/linux/conf/syslog-ng.conf
index 02e2d57..02e2d57 100644
--- a/tools/conf/etc/syslog-ng.conf
+++ b/linux/conf/syslog-ng.conf
diff --git a/tools/conf/etc/rc.conf b/tools/conf/etc/rc.conf
deleted file mode 100644
index 192ef3e..0000000
--- a/tools/conf/etc/rc.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/rc.conf: system configuration
-#
-
-FONT=default
-KEYMAP=dvorak
-TIMEZONE="Europe/Lisbon"
-HOSTNAME=c2
-SYSLOG=syslog-ng
-SERVICES=(apparmor lo net iptables sshd ntpd postgresql exim dovecot git-daemon php-fpm fcgiwrap nginx crond)
-
-# End of file
diff --git a/tools/conf/etc/rc.d/git-daemon b/tools/conf/etc/rc.d/git-daemon
deleted file mode 100755
index fc43cbf..0000000
--- a/tools/conf/etc/rc.d/git-daemon
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-SSD=/sbin/start-stop-daemon
-NAME=git-daemon
-PROG=$(git --exec-path)/${NAME}
-USER=www
-GROUP=gitolite
-PIDFILE=/var/run/git-daemon.pid
-REPOS=/srv/gitolite/repositories
-OPTS="--verbose --reuseaddr --base-path=${REPOS}"
-
-case $1 in
-    start)
-        echo "Starting ${NAME}..."
-        $SSD --start \
-            --pidfile ${PIDFILE} \
-            --exec ${PROG} -- ${OPTS} \
-            --detach --pid-file=${PIDFILE} \
-            --user=${USER} --group=${GROUP}
-
-    ;;
-    stop)
-        echo "Stopping ${NAME}..."
-        $SSD --stop --quiet --name git-daemon \
-                            --pidfile ${PIDFILE}
-        ;;
-    restart)
-        echo "Restarting ${NAME}..."
-        $0 stop
-        $0 start
-        ;;
-    status)
-        $SSD --status --pidfile $PIDFILE
-        case $? in
-        0) echo "$PROG is running with pid $(cat $PIDFILE )" ;;
-        3) echo "$PROG is not running" ;;
-        4) echo "Unable to determine the program status" ;;
-        esac
-        ;;
-    *)
-        echo "usage: $0 [start|stop|restart|status]"
-        ;;
-esac
diff --git a/tools/conf/etc/rc.d/postgresql b/tools/conf/etc/rc.d/postgresql
deleted file mode 100755
index 5f0762a..0000000
--- a/tools/conf/etc/rc.d/postgresql
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# /etc/rc.d/postgresql: start, stop or restart PostgreSQL server postmaster
-#
-
-PG_DATA=/srv/pgsql/data
-
-case "$1" in
-    start|stop|status|restart|reload)
-        sudo -u postgres pg_ctl -D "$PG_DATA" -l /var/log/postgresql "$1"
-        ;;
-    *)
-        echo "usage: $0 start|stop|restart|reload|status"
-        ;;
-esac
-
-# End of file
diff --git a/tools/conf/etc/resolv.conf b/tools/conf/etc/resolv.conf
deleted file mode 100644
index b568a6c..0000000
--- a/tools/conf/etc/resolv.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Generated by dhcpcd from wlp7s0.dhcp
-# /etc/resolv.conf.head can replace this line
-nameserver 127.0.0.1
-# CCC server
-# nameserver 213.73.91.35
-# OpenNIC Servers
-# nameserver 192.71.249.83
-# nameserver 5.135.183.146
-# /etc/resolv.conf.tail can replace this line
diff --git a/tools/dnsmasq.html b/tools/dnsmasq.html
index 4d738e4..f738d76 100644
--- a/tools/dnsmasq.html
+++ b/tools/dnsmasq.html
@@ -28,7 +28,7 @@
         <p>Dnscrypt by default resolves to dnscrypt.eu-nl, check file
         /usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv for a list of
         compatible servers. Dnscrypt-proxy port from machine-ports contains
-        <a href="conf/etc/rc.d/dnscrypt-proxy">dnscrypt-proxy</a> init
+        <a href="../linux/conf/rc.d/dnscrypt-proxy">dnscrypt-proxy</a> init
         script configured to use dnscrypt.eu-dk resolver and run as 
         nobody user. Basic usage example;</p>
 
@@ -38,7 +38,7 @@
 
         <h2 id="dnsmasq">2. Dnsmasq</h2>
 
-        <p>Edit <a href="conf/etc/resolv.conf">resolv.conf</a>;</p>
+        <p>Edit <a href="../linux/conf/resolv.conf">resolv.conf</a>;</p>
 
         <pre>
         # /etc/resolv.conf.head can replace this line
@@ -59,8 +59,8 @@
 
         <p>Dnsmasq provides dns caching and dhcpd, example configuration
         files:
-        <a href="conf/etc/dnsmasq.conf">dnsmasq.conf</a> (change interface),
-        <a href="conf/etc/hosts.dnsmasq">hosts.dnsmasq</a>.</p>
+        <a href="../linux/conf/dnsmasq.conf">dnsmasq.conf</a> (change interface),
+        <a href="../linux/conf/hosts.dnsmasq">hosts.dnsmasq</a>.</p>
 
         <p>Check /var/lib/dhcp/dnsmasq.leases to get list of dhcp leases
         assigned.</p>
diff --git a/tools/mutt.html b/tools/mutt.html
index 4cb5599..802854e 100644
--- a/tools/mutt.html
+++ b/tools/mutt.html
@@ -90,7 +90,7 @@
 
         <p>Lets start configuring the two accounts, one for host system
         email and another for external email account. Change pgp_sign_as        according to your specific sub key for signing. Change
-        <a href="conf/etc/skel/.mutt/muttrc">muttrc</a> with your
+        <a href="../linux/conf/skel/.mutt/muttrc">muttrc</a> with your
         preferences;</p>
 
         <pre>
@@ -170,7 +170,7 @@
         $ env | grep MAIL
         </pre>
 
-        <p>Content of <a href="conf/etc/skel/.mutt/system">.mutt/system</a>;<p>
+        <p>Content of <a href="../linux/conf/skel/.mutt/system">.mutt/system</a>;<p>
 
         <pre>
         color status green default
@@ -208,7 +208,7 @@
 
         <h3 id="external">2.2. External Email</h3>
 
-        <p>Edit <a href="conf/etc/skel/.mutt/external">.mutt/external</a>;</p>
+        <p>Edit <a href="../linux/conf/skel/.mutt/external">.mutt/external</a>;</p>
 
         <pre>
         color status blue default
diff --git a/tools/nginx.html b/tools/nginx.html
index 32685b9..6d0117c 100644
--- a/tools/nginx.html
+++ b/tools/nginx.html
@@ -366,7 +366,7 @@
 
         <h3 id="virtual-server">4.3. Setup virtual server</h3>
 
-        <p>Example of pmwiki virtual server, check <a href="conf/etc/nginx/sites-enabled/">/etc/nginx/sites-enabled</a> for the rest of examples mentioned <a href="#default-server">default server</a>. If wiki server is running on same machine add following to /etc/hosts;</p>
+        <p>Example of pmwiki virtual server, check <a href="../linux/conf/nginx/sites-enabled/">/etc/nginx/sites-enabled</a> for the rest of examples mentioned <a href="#default-server">default server</a>. If wiki server is running on same machine add following to /etc/hosts;</p>
 
         <pre>
         127.0.0.1 wiki.c2.ank
diff --git a/tools/postgresql.html b/tools/postgresql.html
index a87c0b9..a01cb2b 100644
--- a/tools/postgresql.html
+++ b/tools/postgresql.html
@@ -125,7 +125,7 @@
 
         <h3 id="init">2.1. Init script</h3>
 
-        <p>Change <a href="conf/etc/rc.d/postgresql">/etc/rc.d/postgresql</a>;</p>
+        <p>Change <a href="../linux/conf/rc.d/postgresql">/etc/rc.d/postgresql</a>;</p>
 
         <pre>
         #
diff --git a/tools/syslog-ng.html b/tools/syslog-ng.html
index f192fa5..47b35cd 100644
--- a/tools/syslog-ng.html
+++ b/tools/syslog-ng.html
@@ -31,7 +31,7 @@
 
         <h2 id="configure">1.4. Syslog-ng configuration</h2>
 
-        <p>Example of <a href="conf/etc/syslog-ng.conf">/etc/syslog-ng.conf</a>
+        <p>Example of <a href="../linux/conf/syslog-ng.conf">/etc/syslog-ng.conf</a>
         that configures syslog-ng matching tools already installed in the system
         and some that are part of <a href="../tools/index.html">tools</a>.</p>
 
@@ -52,7 +52,7 @@
         # End of file
         </pre>
 
-        <p>Edit <a href="conf/etc/syslog-ng.conf">/etc/syslog-ng.conf</a> with your logging preferences;</p>
+        <p>Edit <a href="../linux/conf/syslog-ng.conf">/etc/syslog-ng.conf</a> with your logging preferences;</p>
 
         <pre>
         @version: 3.25
diff --git a/tools/vim.html b/tools/vim.html
index 6d34312..1721749 100644
--- a/tools/vim.html
+++ b/tools/vim.html
@@ -25,11 +25,11 @@
             <dd>Your personal Vim initializations.</dd>
         </dl>
 
-        <p>Copy <a href="conf/etc/skel/.vimrc">/etc/skel/.vimrc</a> skeleton example, so that each user have a base to start
+        <p>Copy <a href="../linux/conf/skel/.vimrc">/etc/skel/.vimrc</a> skeleton example, so that each user have a base to start
         personalizing it;</p>
 
         <pre>
-        $ sudo cp ~/doc/conf/etc/skel/.vimrc /etc/skel/
+        $ sudo cp ~/doc/../linux/conf/skel/.vimrc /etc/skel/
         $ sudo mkdir /etc/skel/.vim
         $ sudo mkdir /etc/skel/.vim/swap
         $ sudo mkdir /etc/skel/.vim/views
diff --git a/tools/x.html b/tools/x.html
index 0e9a4eb..b4df557 100644
--- a/tools/x.html
+++ b/tools/x.html
@@ -40,7 +40,7 @@
 
         <h3>Local xinitrc</h3>
 
-        <p>Local xinitrc configuration: <a href="conf/etc/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
+        <p>Local xinitrc configuration: <a href="../linux/conf/skel/.xinitrc">/etc/skel/.xinitrc</a>;</p>
 
         <pre>
 	## Start the window manager
@@ -59,7 +59,7 @@
         </pre>
 
         <h3>Global xinitrc</h3>
-        <p>Global xinitrc configuration: <a href="conf/etc/X11/xinit/xinitrc">/usr/etc/X11/xinit/xinitrc</a>;</p>
+        <p>Global xinitrc configuration: <a href="../linux/conf/X11/xinit/xinitrc">/usr/etc/X11/xinit/xinitrc</a>;</p>
 
         <pre>
         #!/bin/sh
@@ -101,7 +101,7 @@
 
         <h3 id="confkeyboard">Keyboard config</h3>
 
-	<p>Xorg global default keyboard configuration; <a href="conf/etc/X11/xorg.conf.d/10-keyboard.conf">/etc/X11/xorg.conf.d/10-keyboard.conf</a></p>
+	<p>Xorg global default keyboard configuration; <a href="../linux/conf/X11/xorg.conf.d/10-keyboard.conf">/etc/X11/xorg.conf.d/10-keyboard.conf</a></p>
 
         <pre>
          Section "InputClass"