small fixes and additions

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index bb6dafe0e9b83217b7e630af23901c352af58924..13a4dd102c6c8d49b6993155d79cbf1362abe9ae 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -43,10 +43,10 @@ esac
 pup
 
 simple_packages=(
-    rdiff-backup
     htop
     mailutils
     nmon
+    rdiff-backup
     ruby
     ruby-rest-client
     tree
@@ -67,6 +67,7 @@ case $HOSTNAME in
             fdupes
             filelight
             gdb
+            goaccess
             gnome-screenshot
             jq
             locate
@@ -805,6 +806,17 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\
 ########### misc stuff
 
 
+s cedit /etc/goaccess.conf <<'EOF'
+# all things found from looking around the default config
+# copied existing NCSA Combined Log Format with Virtual Host, plus %L
+log-format %^:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u" %L
+time-format %H:%M:%S
+date-format %d/%b/%Y
+log-file /var/log/apache2/access.log
+color-scheme 2
+EOF
+
+
 if [[ $HOSTNAME == frodo ]] && ! sudo test -e /etc/openvpn/client.key; then
     /a/bin/vpn-setup/vpn-mk-client-cert dopub
 fi
@@ -1059,20 +1071,22 @@ fi
 
 case $distro in
     debian|ubuntu)
-# systemd claims it generates units from /etc/init.d, but it clearly doesn't
-# in debian. I have no idea how they are related. fuck debian right now. It's
-# not documented.  samba has a systemd init file linked to /dev/null.
-# There's this https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769714 which
-# claims samba's sub-services will be started automatically by systemd... it
-# didn't on install, wonder if it will on boot. It clued me in how to start
-# it manually though. Nothing in /usr/share/doc/samba, debian admin guide
-# says nothing about any of this. (this is in debian testing as of 4/2016).
-
-s /etc/init.d/samba start
-;;
-                        arch)
-                            sgo samba
-                            ;;
+        # systemd claims it generates units from /etc/init.d, but it
+        # clearly doesn\'t in debian. I have no idea how they are
+        # related. fuck debian right now. It\'s not documented.  samba
+        # has a systemd init file linked to /dev/null.  There\'s this
+        # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=769714 which
+        # claims samba\'s sub-services will be started automatically by
+        # systemd... it didn\'t on install, wonder if it will on
+        # boot. It clued me in how to start it manually though. Nothing
+        # in /usr/share/doc/samba, debian admin guide says nothing about
+        # any of this. (this is in debian testing as of 4/2016).
+
+        s /etc/init.d/samba start
+        ;;
+    arch)
+        sgo samba
+        ;;
 esac
 
 tu /etc/hosts <<< "127.0.1.1 $(hostname).lan $(hostname)"