lots of updates

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index c13ef340c8a58fd7e26cb99c19001cd9c41df260..285b25cd4e4e834806d428c9e7c0afad2310e106 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -61,6 +61,8 @@ case $HOSTNAME in
         # universal packages
         # swh-plugins is for karaoke pulsaudio filter.
         # mutagen for pithos
+        # guvcview set webcam brightness to highest
+        # pidgin-otr, i went into pidgin pluggin settings and generated a key for some accounts
         simple_packages+=(
             apache2
             apache2-doc
@@ -77,6 +79,7 @@ case $HOSTNAME in
             chromium
             cpio-doc
             cloc
+            cpulimit
             cron
             debconf-doc
             dirmngr
@@ -102,6 +105,7 @@ case $HOSTNAME in
             goaccess
             gnome-screenshot
             gnome-session-flashback
+            guvcview
             i3lock
             inetutils-traceroute
             iproute2-doc
@@ -130,6 +134,7 @@ case $HOSTNAME in
             perl-doc
             pianobar
             pidgin
+            pidgin-otr
             pry
             python-autopep8
             python3-doc
@@ -146,6 +151,7 @@ case $HOSTNAME in
             transmission-remote-gtk
             vlc
             whois
+            wondershaper
         )
         spa $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}')
         ;;
@@ -609,6 +615,26 @@ esac
 ########### end section including li/lj ###############
 
 if [[ $HOSTNAME == treetowl ]]; then
+
+    # vpn-server setup via:
+
+    vpn-server-setup -r -d
+    s tee -a /etc/openvpn/server/server.conf <<'EOF'
+push "dhcp-option DNS 192.168.1.1"
+push "route 192.168.1.0 255.255.255.0"
+client-connect /a/bin/distro-setup/vpn-client-connect
+EOF
+    s sed -i --follow-symlinks 's/10.8./10.9./g' /etc/openvpn/server/server.conf
+    ser restart openvpn-server@server
+    vpn-mk-client-cert -s /etc/update-resolv-conf-home -c x2 -n home b8.nz
+    dir=/p/c/machine_specific/x2/filesystem/etc/openvpn/client
+    mkdir -p $dir
+    # background: We have these files locally, but we\'d have to duplicate the logic
+    # in vpn-mk-client-cert to get them, and this is just simpler.
+    scp root@x2:/etc/openvpn/client/home* $dir
+
+
+
     # note, see bashrc for more documentation.
     pi rss2email
     s dd of=/etc/systemd/system/rss2email.service <<'EOF'
@@ -933,7 +959,7 @@ EOF
   "profiles" : [
     {
       "profile-name" : "Default",
-      "hostname" : "transmission",
+      "hostname" : "transmission.b8.nz",
       "rpc-url-path" : "/transmission/rpc",
       "username" : "",
       "password" : "$rpc_pass",