various fixes

diff --git a/btrbk-run b/btrbk-run
index 32a0c1d25a176b487d7ec5a13e19f92e01b1783a..9ca4eb3333eaffbaa8b176a71d73d240c5530d6b 100755 (executable)
--- a/btrbk-run
+++ b/btrbk-run
@@ -6,21 +6,14 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
 conf_only=false
-if [[ $1 == -c ]]; then
-    # mostly for testing
-    conf_only=true
-fi
-
-target_host=frodo
-cat >/etc/btrbk.conf <<'EOF'
-ssh_identity /root/.ssh/id_rsa
-transaction_syslog daemon
-
-# so we only run one at a time
-lockfile                   /var/lock/btrbk.lock
+dry_run=false
+# mostly for testing
+case $1 in
+    -c) conf_only=true ;;
+    -n) dry_run=true ;;
+    ?*) echo "$0: error: unsupported arg"; exit 1 ;;
+esac
 
-# default format of short does not accomidate hourly preservation setting
-timestamp_format long-iso
 # background on timezones. with short/long, timestamps use local time.
 # for long, if your local time moves backwards, by moving timezones or
 # for an hour when daylight savings changes it, you will temporarily get
@@ -36,6 +29,17 @@ timestamp_format long-iso
 # I don't see any problem with shifting when the day starts for
 # retention, so I'm using long-iso.
 
+target_host=frodo
+cat >/etc/btrbk.conf <<'EOF'
+ssh_identity /root/.ssh/id_rsa
+transaction_syslog daemon
+
+# so we only run one at a time
+lockfile                   /var/lock/btrbk.lock
+
+# default format of short does not accomidate hourly preservation setting
+timestamp_format long-iso
+
 # only make a snapshot if things have changed
 snapshot_create onchange
 # much less snapshots because I have less space on the
@@ -85,4 +89,8 @@ if $conf_only; then
     exit
 fi
 
-btrbk -q run
+if $dry_run; then
+    btrbk -n run
+else
+    btrbk -q run
+fi

diff --git a/distro-begin b/distro-begin
index b03134890ea3e4e67de6ade28ac275bbbd2771a4..a53cbb4f23ffac9a2d0c583f81b0df620dfe22a7 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -542,12 +542,30 @@ s mkdir -p "${dirs[@]}"
 s chown ian:ian  "${dirs[@]}"
 
 if [[ $HOSTNAME == treetowl ]]; then
-    tu /etc/fstab <<'EOF'
-/dev/disk/by-id/ata-TOSHIBA_MD04ACA500_84REK6NTFS9A-part1 /i btrfs  noatime,subvol=i  0 0
+    # partitioned it with fai partitioner outside of fai,
+    # because it\'s worth it to have 1% space reserved for boot and
+    # swap partitions in case I ever want to boot off those drives.
+    # as root:
+    # . /a/bin/fai/fai-wrapper
+    # eval-fai-classfile /a/bin/fai/fai/config/class/51-multi-boot
+    # fai-setclass ROTATIONAL
+    # export LUKS_DIR=/q/root/luks/
+    # # because the partition nums existed already
+    # fai-setclass REPARTITION
+    # /a/bin/fai/fai/config/hooks/partition.DEFAULT
+
+    # just the first in the btrfs raid
+    dev=ata-TOSHIBA_MD04ACA500_84REK6NTFS9A-part1
+    tu /etc/fstab <<EOF
+/dev/mapper/crypt_dev_$dev /i btrfs  noatime,subvol=i  0 0
 EOF
 else
     tu /etc/fstab <<'EOF'
 /q/i  /i  none  bind  0 0
+EOF
+
+    tu /etc/crypttab <<EOF
+crypt_dev_$dev  /dev/disk/by-id/$dev  /q/root/luks/host-treetowl  discard,luks
 EOF
 fi
 
@@ -556,6 +574,8 @@ tu /etc/fstab <<'EOF'
 /i/k  /k  none  bind  0 0
 EOF
 
+
+
 if ! mountpoint /kr; then
     s mkdir -p /kr
     s chown ian:traci /kr

diff --git a/distro-end b/distro-end
index b19c41d0ba8bb856aeaaac58a8f43b005d48fd34..4a26ee12d6ac715645115d6c07a673068e6417e0 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -803,7 +803,7 @@ pi smartmontools
 # short test daily 2-3am, extended tests Saturdays between 3-4am:
 sched="-s (S/../.././02|L/../../6/03)"
 s sed -i --follow-symlinks "s#^[[:space:]]*DEVICESCAN.*#\
-DEVICESCAN -a -o on -S on -n standby,q $sched\
+DEVICESCAN -a -o on -S on -n standby,q $sched \
 -m ian@iankelling.org -M exec /usr/local/bin/smart-notify#" /etc/smartd.conf
 
 # in the default configuration of at least ubuntu 14.04, resolvconf is
@@ -823,14 +823,19 @@ DEVICESCAN -a -o on -S on -n standby,q $sched\
 ########### misc stuff
 
 
-s cedit /etc/goaccess.conf <<'EOF'
+s cedit /etc/goaccess.conf <<'EOF' || [[ $? == 1 ]]
 # 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
+log-format %^:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u" %D
 time-format %H:%M:%S
 date-format %d/%b/%Y
 log-file /var/log/apache2/access.log
 color-scheme 2
+
+# tip: copy access.log files to a stretch host directory, then run
+# jessie's goaccess is too old for some options, and it's
+# not easily installed from a testing.
+# goaccess --ignore-crawlers -f <(cat *) -a -o html > x.html
 EOF