iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes
[distro-setup]
/
distro-end
diff --git
a/distro-end
b/distro-end
index 593e91e598b89b510802fcb9f67a5fd3c43bfa67..cdfd64dc112ec2e30b33e1d79a52c468e767dec4 100755
(executable)
--- a/
distro-end
+++ b/
distro-end
@@
-619,7
+619,7
@@
case $HOSTNAME in
dnsb8
fi
dnsb8
fi
- s /c/roles/prom
-export/files/simple/usr/local/bin/fsf-install-node-exporter -l
+ s /c/roles/prom
_export/files/simple/usr/local/bin/fsf-install-node-exporter -l 127.0.0.1
# ex for exporter
web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF'
# ex for exporter
web-conf -p 9101 -f 9100 - apache2 ${HOSTNAME}ex.b8.nz <<'EOF'
@@
-1689,7
+1689,7
@@
sudo gpasswd -a $USER lpadmin # based on ubuntu wiki
m /a/bin/buildscripts/go
# only needed for rg. cargo takes up 11 gigs, filled up the disk on je.
m /a/bin/buildscripts/go
# only needed for rg. cargo takes up 11 gigs, filled up the disk on je.
-
#
m /a/bin/buildscripts/rust
+m /a/bin/buildscripts/rust
m /a/bin/buildscripts/misc
m /a/bin/buildscripts/pithosfly
#m /a/bin/buildscripts/alacritty
m /a/bin/buildscripts/misc
m /a/bin/buildscripts/pithosfly
#m /a/bin/buildscripts/alacritty
@@
-1950,28
+1950,20
@@
sgo dynamicipupdate
if grep -xFq $HOSTNAME /a/bin/ds/machine_specific/btrbk.hosts; then
sgo btrbk.timer
fi
if grep -xFq $HOSTNAME /a/bin/ds/machine_specific/btrbk.hosts; then
sgo btrbk.timer
fi
-if [[ $HOSTNAME == kd ]]; then
- sgo btrbk-spread.timer
-fi
-# note: to see when
it
was last run,
+# note: to see when
a timer
was last run,
# ser list-timers
# ser list-timers
-case $HOSTNAME in
- kd)
- sgo btrbkrust.timer
- ;;
-esac
### begin prometheus ###
### begin prometheus ###
-
-
case $HOSTNAME in
kd)
# Font awesome is needed for the alertmanager ui.
pi prometheus-alertmanager prometheus fonts-font-awesome
/c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus
case $HOSTNAME in
kd)
# Font awesome is needed for the alertmanager ui.
pi prometheus-alertmanager prometheus fonts-font-awesome
/c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus
+ # make it available for other machines
+ rsync -a /usr/local/bin/amtool /a/opt/bin
web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
<Location "/">
AuthType Basic
web-conf -p 9091 -f 9090 - apache2 i.b8.nz <<'EOF'
<Location "/">
AuthType Basic
@@
-2007,7
+1999,7
@@
EOF
ser restart prometheus-alertmanager
fi
ser restart prometheus-alertmanager
fi
- s /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l
+ s /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l
127.0.0.1
for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
sysd-prom-fail-install $ser
for ser in prometheus-node-exporter prometheus-alertmanager prometheus; do
sysd-prom-fail-install $ser
@@
-2015,7
+2007,7
@@
EOF
;;
*)
;;
*)
- s /c/roles/prom
-
export/files/simple/usr/local/bin/fsf-install-node-exporter
+ s /c/roles/prom
_
export/files/simple/usr/local/bin/fsf-install-node-exporter
;;
esac
;;
esac
@@
-2178,6
+2170,10
@@
case $HOSTNAME in
sudo usermod -a -G bitcoin iank
# todo: make bitcoin have a stable uid/gid
if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
sudo usermod -a -G bitcoin iank
# todo: make bitcoin have a stable uid/gid
if [[ ! $(readlink -f /var/lib/bitcoind/wallets) == /q/wallets ]]; then
+ mkdir -p /var/lib/bitcoind
+ chown bitcoin:bitcoin /var/lib/bitcoind
+ # 710 comes from the upstream bitcoin unit file
+ chmod 710 /var/lib/bitcoind
s lnf /q/wallets /var/lib/bitcoind
sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
fi
s lnf /q/wallets /var/lib/bitcoind
sudo chown -h bitcoin:bitcoin /var/lib/bitcoind/wallets
fi
@@
-2191,7
+2187,7
@@
esac
case $HOSTNAME in
kw|x3)
sd /etc/cups/client.conf <<'EOF'
case $HOSTNAME in
kw|x3)
sd /etc/cups/client.conf <<'EOF'
-ServerName printserver
0
.office.fsf.org
+ServerName printserver
1
.office.fsf.org
EOF
;;
esac
EOF
;;
esac