minor improvements

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index 1b25a55eced2a26e3dd6e5a74903af810ca14adf..64441d1cfc9d477847610a3158b8b72ac2f6a438 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -131,6 +131,7 @@ fi
 ###  end docker install ####
 
 
+
 ### begin certbot install ###
 case $distro in
   debian)
@@ -180,6 +181,22 @@ sgo certbotmail.timer
 
 pi ${p1[@]}
 
+
+## prometheus node exporter setup
+web-conf -f 9100 -p 9101 apache2 $(hostname -f) <<'EOF'
+#https://httpd.apache.org/docs/2.4/mod/mod_authn_core.html#authtype
+# https://stackoverflow.com/questions/5011102/apache-reverse-proxy-with-basic-authentication
+<Location />
+   AllowOverride None
+   AuthType basic
+   AuthName "Authentication Required"
+   # setup one time, with root:www-data, 640
+   AuthUserFile "/etc/prometheus-htpasswd"
+   Require valid-user
+</Location>
+EOF
+
+
 # website setup
 case $HOSTNAME in
   lj|li)
@@ -1349,17 +1366,24 @@ esac
 
 case $distro in
   arch)
+    pi virt-install
     # otherwise we get error about accessing kvm module.
     # seems like there might be a better way, but google was a bit vague.
     s $sed -ri '/^ *user *=/d' /etc/libvirt/qemu.conf
     echo 'user = "root"' | s tee -a /etc/libvirt/qemu.conf
-    # https://bbs.archlinux.org/viewtopic.php?id=206206
-    # # this should prolly go in the wiki
-    sgo virtlogd.socket
     # guessing this is not needed
     #sgo virtlogd.service
-    sgo libvirtd
+
+    # iank: disabed as im not using libvirt usually
+    # # https://bbs.archlinux.org/viewtopic.php?id=206206
+    # # # this should prolly go in the wiki
+    # sgo virtlogd.socket
+    # sgo libvirtd
     ;;
+  debian|trisquel|ubuntu)
+    pi-nostart virtinst virt-manager
+    ;;
+
 esac