From 9d21aed0c95e0c343f2769a724d9dbb220874185 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 24 Jul 2019 13:14:17 -0400 Subject: [PATCH] fix btrbk timing issue. improve email stuff --- brc | 29 ++++-- btrbk-run | 8 +- mail-notes.conf | 94 +++++++++++++++++ mail-setup | 255 +++++++++++++---------------------------------- switch-mail-host | 18 ++-- 5 files changed, 204 insertions(+), 200 deletions(-) create mode 100644 mail-notes.conf diff --git a/brc b/brc index bf8548f..b8eb120 100644 --- a/brc +++ b/brc @@ -61,7 +61,7 @@ shopt -s cmdhist shopt -s globstar -# inside emcas fixes +# inside emacs fixes if [[ $RLC_INSIDE_EMACS ]]; then # EMACS is used by bash on startup, but we dont need it anymore. # plus I hit a bug in a makefile which inherited it @@ -96,6 +96,19 @@ if [[ $RLC_INSIDE_EMACS ]]; then fi +# emacs has a different default search path than the info command. This +# adds the info defaults to emacs, but not the reverse, because I dun +# care much about the cli. The search path is only on the cli if you run +# "info xxx", or in emacs if you run '(info xxx)', so not that +# important, but might as well fix it. + +# info info says this path is what was compiled, and its not documented +# anywhere. Through source grepping, i found it in filesys.h of the info +# source in trisquel flidas. +# +# Traling : means for emacs to add its own stuff on to the end. + +export INFOPATH=$PATH:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info:.: if [[ $- == *i* ]]; then # for readline-complete.el @@ -371,19 +384,19 @@ b() { bbk() { c / local active=true - if systemctl is-active btrbk.service; then - echo "cron btrbk is already running" - return 1 - fi systemctl is-active btrbk.timer || active=false if $active; then ser disable btrbk.timer fi + if systemctl is-active btrbk.service; then + $active && ser enable btrbk.timer + echo "cron btrbk is already running" + return 1 + fi # run latest install-my-scripts - if ! btrbk-run "$@" && $active; then - ser enable btrbk.timer - fi + btrbk-run "$@" + $active && ser enable btrbk.timer } bfg() { java -jar /a/opt/bfg-1.12.14.jar "$@"; } diff --git a/btrbk-run b/btrbk-run index e30c9c3..fa20061 100644 --- a/btrbk-run +++ b/btrbk-run @@ -247,7 +247,14 @@ fi echo "mountpoints: ${mountpoints[*]}" +##### end command line parsing ######## +if [[ $source ]]; then + if [[ $(ssh $source systemctl is-active btrbk.service) != inactive ]]; then + echo "$0: error: cron btrbk is running on source. exiting out of caution" + exit 1 + fi +fi # pull_reexec stops us from getting into an infinite loop if there is some # kind of weird problem @@ -270,7 +277,6 @@ if ! $pull_reexec && [[ $source ]] && $pulla ; then fi -##### end command line parsing ######## diff --git a/mail-notes.conf b/mail-notes.conf new file mode 100644 index 0000000..65b4f54 --- /dev/null +++ b/mail-notes.conf @@ -0,0 +1,94 @@ +# # initial comment is from the file itself, subsequent ones +# are based on debconf output unless otherwise noted. + + +# /etc/exim4/update-exim4.conf.conf +# +# Edit this file and /etc/mailname by hand and execute update-exim4.conf +# yourself or use 'dpkg-reconfigure exim4-config' +# +# Please note that this is _not_ a dpkg-conffile and that automatic changes +# to this file might happen. The code handling this will honor your local +# changes, so this is usually fine, but will break local schemes that mess +# around with multiple versions of the file. +# +# update-exim4.conf uses this file to determine variable values to generate +# exim configuration macros for the configuration file. +# +# Most settings found in here do have corresponding questions in the +# Debconf configuration, but not all of them. +# +# This is a Debian specific file + + +# Its not easy to looku + + +# Mail Server configuration +# ------------------------- + +# Please select the mail server configuration type that best meets your needs. + +# Systems with dynamic IP addresses, including dialup systems, should generally be +# configured to send outgoing mail to another machine, called a 'smarthost' for +# delivery because many receiving systems on the Internet block incoming mail from +# dynamic IP addresses as spam protection. + +# A system with a dynamic IP address can receive its own mail, or local delivery can be +# disabled entirely (except mail for root and postmaster). + +# 1. internet site; mail is sent and received directly using SMTP +# 2. mail sent by smarthost; received via SMTP or fetchmail +# 3. mail sent by smarthost; no local mail +# 4. local delivery only; not on a network +# 5. no configuration at this time + +# General type of mail configuration: 1 +dc_eximconfig_configtype + + + + + +# Please enter a semicolon-separated list of recipient domains for which this machine +# should consider itself the final destination. These domains are commonly called +# 'local domains'. The local hostname (kd.lan) and 'localhost' are always added +# to the list given here. + +# By default all local domains will be treated identically. If both a.example and +# b.example are local domains, acc@a.example and acc@b.example will be delivered to the +# same final destination. If different domain names should be treated differently, it +# is necessary to edit the config files afterwards. + +dc_other_hostnames + + +# Please enter a semicolon-separated list of IP addresses. The Exim SMTP listener +# daemon will listen on all IP addresses listed here. + +# An empty value will cause Exim to listen for connections on all available network +# interfaces. + +# If this system only receives mail directly from local services (and not from other +# hosts), it is suggested to prohibit external connections to the local Exim daemon. +# Such services include e-mail programs (MUAs) which talk to localhost only as well as +# fetchmail. External connections are impossible when 127.0.0.1 is entered here, as +# this will disable listening on public network interfaces. + +# IP-addresses to listen on for incoming SMTP connections: +dc_local_interfaces + + + +# Exim is able to store locally delivered email in different formats. The most commonly +# used ones are mbox and Maildir. mbox uses a single file for the complete mail folder +# stored in /var/mail/. With Maildir format every single message is stored in a +# separate file in ~/Maildir/. + +# Please note that most mail tools in Debian expect the local delivery method to be +# mbox in their default. + +# 1. mbox format in /var/mail/ 2. Maildir format in home directory + +# Delivery method for local mail: 2 +dc_localdelivery='maildir_home' diff --git a/mail-setup b/mail-setup index 058fb4f..abe98d9 100755 --- a/mail-setup +++ b/mail-setup @@ -66,6 +66,7 @@ EOF # apg -m 50 -x 70 -n 1 -a 1 -M CLN >$f # s sed -i "/^$user:/d" /p/c/filesystem/etc/exim4/passwd # echo "$user:$(mkpasswd -m sha-512 -s <$f)" >>/p/c/filesystem/etc/exim4/passwd +# # todo: port is no longer used in mailpass, remove it. # echo "mail.iankelling.org 587 $user:$(<$f)" >> /p/c/machine_specific/$user/filesystem/etc/mailpass # # then run this script, or part of it which uses /etc/mailpass @@ -179,15 +180,9 @@ EOF #exim4 -bt iank@localhost -postconfin() { - local MAPFILE - mapfile -t - local s - postconf -ev "${MAPFILE[@]}" -} e() { printf "%s\n" "$*"; } pi() { # package install - local s f + local f if dpkg -s -- "$@" &> /dev/null; then return 0; fi; @@ -247,27 +242,6 @@ if [[ -e /p/c/filesystem ]]; then fi fi -cat >/etc/systemd/system/offlineimapsync.timer <<'EOF' -[Unit] -Description=Run offlineimap-sync once every min - -[Timer] -OnCalendar=*:0/1 - -[Install] -WantedBy=timers.target -EOF - -cat >/etc/systemd/system/offlineimapsync.service </etc/systemd/system/mailclean.timer <<'EOF' [Unit] @@ -293,34 +267,6 @@ EOF systemctl daemon-reload -# wording of question from dpkg-reconfigure exim4-config -# 1. internet site; mail is sent and received directly using SMTP -# 2. mail sent by smarthost; received via SMTP or fetchmail -# 3. mail sent by smarthost; no local mail -# 4. local delivery only; not on a network -# 5. no configuration at this time -# -# Note, I have used option 2 in the past for receiving mail -# from lan hosts, sending external mail via another smtp server. -# -# Note, other than configtype, we could set all the options in -# both types of configs without harm, they would either be -# ignored or be disabled by other settings, but the default -# local_interfaces definitely makes things more secure. - -# most of these settings get translated into settings -# in /etc/exim4/update-exim4.conf.conf -# how /etc/exim4/update-exim4.conf.conf translates into actual exim settings is -# documented in man update-exim4.conf, which outputs to the config that -# exim actually reads. except the man page is not perfect, for example, -# it doesn't document that it sets -# DCconfig_${dc_eximconfig_configtype}" "1" -# which is a line from update-exim4.conf, which is a relatively short bash script. -# mailname setting sets /etc/mailname - -debconf-set-selections </etc/exim4/update-exim4.conf.conf <<'EOF' +# default stuff, i havent checked if its needed +dc_minimaldns='false' +dc_relay_nets='' +CFILEMODE='644' +dc_use_split_config='true' +dc_local_interfaces='' +dc_mailname_in_oh='true' +EOF if [[ $HOSTNAME == $MAIL_HOST ]]; then @@ -487,115 +443,44 @@ server=/mail.iankelling.org/127.0.1.1 EOF systemctl reload dnsmasq - debconf-set-selections <>/etc/exim4/update-exim4.conf.conf < /etc/mailname # MAIN_HARDCODE_PRIMARY_HOSTNAME might mess up the @@ -776,8 +661,6 @@ RestartSec=1 StartLimitInterval=0 EOF - systemctl enable offlineimapsync.timer - systemctl start offlineimapsync.timer systemctl enable mailclean.timer systemctl start mailclean.timer systemctl restart $vpn_ser@mail @@ -795,8 +678,6 @@ EOF echo | /a/exe/cedit mail /etc/dnsmasq-servers.conf || [[ $? == 1 ]] systemctl reload dnsmasq - systemctl disable offlineimapsync.timer &>/dev/null ||: - systemctl stop offlineimapsync.timer &>/dev/null ||: systemctl disable mailclean.timer &>/dev/null ||: systemctl stop mailclean.timer &>/dev/null ||: systemctl disable $vpn_ser@mail @@ -808,27 +689,20 @@ EOF # would only exist because I wrote it i the previous condition, # it\'s not part of exim rm -f /etc/exim4/conf.d/main/000_localmacros - debconf-set-selections <>/etc/exim4/update-exim4.conf.conf < /etc/mailname fi # end $HOSTNAME != $MAIL_HOST -# if we already have it installed, need to reconfigure, without being prompted -if dpkg -s exim4-config &>/dev/null; then - # gotta remove this, otherwise the set-selections are completely - # ignored. It woulda been nice if this was documented somewhere! - rm -f /etc/exim4/update-exim4.conf.conf - while fuser /var/lib/dpkg/lock &>/dev/null; do sleep 1; done - dpkg-reconfigure -u -fnoninteractive exim4-config -fi +systemctl reload exim4 # i have the spool directory be common to distro multi-boot, so # we need the uid to be the same. 608 cuz it's kind of in the middle @@ -911,10 +785,10 @@ sed -r s/^\\S+:/$b:/ 600_exim4-config_userforward >175_$b f=/etc/exim4/passwd.client rm -f /etc/exim4/passwd.client install -m 640 -g Debian-exim /dev/null $f -cat /etc/mailpass| while read -r domain port pass; do +while read -r domain _ pass; do # reference: exim4_passwd_client(5) printf "%s:%s\n" "$domain" "$pass" >>$f -done +done