X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-end;h=3772e87a3d189607c69ae4beebb0e3e9e2c92c61;hb=f9ec6d39566c13775abd5d1709a44e5bd1c32997;hp=9d3f6f5048e9c33529e736366912f327f7a2ed73;hpb=7c40848349654f32903ce11d14337b01e740ff89;p=distro-setup diff --git a/distro-end b/distro-end index 9d3f6f5..3772e87 100755 --- a/distro-end +++ b/distro-end @@ -1,21 +1,21 @@ #!/bin/bash -l -# Copyright (C) 2016 Ian Kelling +# Copyright (C) 2019 Ian Kelling +# SPDX-License-Identifier: AGPL-3.0-or-later -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at +### setup +source /a/bin/errhandle/err +src="$(readlink -f -- "${BASH_SOURCE[0]}")"; src=${src%/*} # directory of this file -# http://www.apache.org/licenses/LICENSE-2.0 +if [[ $EUID == 0 ]]; then + echo "$0: error: run as regular user" >&2 + exit 1 +fi -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +_errcatch_cleanup() { + echo 1 >~/.local/distro-end +} -### setup -source /a/bin/errhandle/err -src="${BASH_SOURCE%/*}" +# shellcheck source=./pkgs source $src/pkgs set -x @@ -27,10 +27,26 @@ end_msg() { IFS= read -r -d '' y ||: end_msg_var+="$y" } +end() { + e "$end_msg_var" + echo 0 >~/.local/distro-end + if $pending_reboot; then + echo "$0: pending reboot and then finished. doing it now." + s reboot now + else + echo "$0: $(date): ending now)" + fi + exit 0 +} +die() { + printf "$0: %s\n" "$*" >&2; exit 1 +} spa() { # simple package add simple_packages+=($@) } distro=$(distro-name) +codename=$(debian-codename) +codename_compat=$(debian-codename-compat) pending_reboot=false sed="sed --follow-symlinks" # template @@ -43,8 +59,14 @@ if isdeb; then pi aptitude fi -########### begin section including li ################ -pi ${p3[@]} $($src/distro-pkgs) +# avoid prompts +s debconf-set-selections </dev/null; then - # this condition is just a speed optimization - pi apt-file - s apt-file update - fi - ;; -esac +if isdeb && pcheck apt-file; then + # this condition is just a speed optimization + pi apt-file + s apt-file update +fi + # disable motd junk. case $distro in @@ -82,80 +98,34 @@ case $distro in # this says disabling the service, it will still get restarted # but this script doesn't do anything on restart, so it should be fine s dd of=/var/run/motd.dynamic if=/dev/null - # stretch doesn't have initscripts pkg installed by default - if [[ $(debian-codename) == jessie ]]; then - s update-rc.d motd disable - fi ;; trisquel|ubuntu) # this isn't a complete solution. It still shows me when updates are available, # but it's no big deal. - s t /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header + s rm -f /etc/update-motd.d/10-help-text /etc/update-motd.d/00-header ;; esac -# automatic updates -# reference: -# https://debian-handbook.info/browse/stable/sect.regular-upgrades.html -# /etc/cron.daily/apt calls unattended-upgrades -# /usr/share/doc/unattended-upgrades# cat README.md -# /etc/apt/apt.conf.d/50unattended-upgrades -if isdebian; then - setup-debian-auto-update -fi -### begin docker install #### -if isdeb; then - # https://store.docker.com/editions/community/docker-ce-server-debian?tab=description - pi software-properties-common apt-transport-https - curl -fsSL https://download.docker.com/linux/$(distro-name-compat)/gpg | sudo apt-key add - - url=https://download.docker.com/linux/$(distro-name-compat) - l="deb [arch=amd64] $url $(debian-codename-compat) stable" +### begin certbot install ### +if [[ $distro == debian ]]; then + # note, need python-certbot-nginx for nginx, but it depends on nginx, + # and I'm not installing nginx by default right now. + pi certbot python-certbot-apache +elif [[ $codename_compat == xenial ]]; then + # not packaged in xenial or flidas + pi software-properties-common + l="deb http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main" if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then - sudo add-apt-repository "$l" + s add-apt-repository -y ppa:certbot/certbot ||: p update fi - # docker eats up a fair amount of cpu when doing nothing, so don't enable it unless - # we really need it. - pi-nostart docker-ce - # and docker is even more crap, it ignores that it shouldnt start - ser stop docker - ser disable docker - case $HOSTNAME in - li|lj) sgo docker ;; - esac - # other distros unknown + pi python-certbot-apache +else + die "distro unknown for certbot" fi -### end docker install #### - - - -### begin certbot install ### -case $distro in - debian) - # note, need python-certbot-nginx for nginx, but it depends on nginx, - # and I'm not installing nginx by default right now. - # note python-certbot-apache is in suggests, but so is a doc package that brought in xorg - if [[ $(debian-codename) == jessie ]]; then - pi -t jessie-backports certbot python-certbot-apache - else - pi certbot python-certbot-apache - fi - ;; - trisquel|ubuntu) - # not packaged in xenial or flidas - pi software-properties-common - l="deb http://ppa.launchpad.net/certbot/certbot/ubuntu xenial main" - if ! grep -xFq "$l" /etc/apt/sources.list{,.d/*.list}; then - s add-apt-repository -y ppa:certbot/certbot ||: - p update - fi - pi python-certbot-apache - ;; - # todo: other distros unknown -esac # make a version of the certbot timer that emails me. x=/systemd/system/certbot $sed -r -f - /lib$x.timer <<'EOF' |s dd of=/etc${x}mail.timer @@ -179,48 +149,283 @@ sgo certbotmail.timer # ;; # esac -pi ${p1[@]} -##### begin automatic upgrades #### -# this makes it so we upgrade everything -debconf-set-selections <<'EOF' -unattended-upgrades unattended-upgrades/origins_pattern string "codename=${distro_codename}"; +## not actually using prometheus just yet +# # office is not exposed to internet yet +# if [[ $HOSTNAME != kw ]]; then +# ## 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 +# +# AllowOverride None +# AuthType basic +# AuthName "Authentication Required" +# # setup one time, with root:www-data, 640 +# AuthUserFile "/etc/prometheus-htpasswd" +# Require valid-user +# +# EOF +# fi + + +######### begin flidas pinned packages ###### +case $(debian-codename) in + # needed for debootstrap scripts for fai since fai requires debian + flidas) + curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add - + s dd of=/etc/apt/preferences.d/flidas-xenial </dev/null </etc/cron.d/unattended-upgrade-reboot -##### end automatic upgrades #### + s apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 + s dd of=/etc/apt/preferences.d/flidas-bionic < - AllowOverride None - AuthType basic - AuthName "Authentication Required" - # setup one time, with root:www-data, 640 - AuthUserFile "/etc/prometheus-htpasswd" - Require valid-user - +Package: * +Pin: release a=bionic-security +Pin-Priority: -100 EOF + # better to run btrfs-progs which matches our kernel version + # (note, renamed from btrfs-tools) + s dd of=/etc/apt/preferences.d/btrfs-progs <$t <$t <$t < - Options +FollowSymLinks +Multiviews +Indexes - AllowOverride None - AuthType basic - AuthName "Authentication Required" - # setup one time, with root:www-data, 640 - AuthUserFile "/etc/caldav-htpasswd" - Require valid-user - + + Options +FollowSymLinks +Multiviews +Indexes + AllowOverride None + AuthType basic + AuthName "Authentication Required" + # setup one time, with root:www-data, 640 + AuthUserFile "/etc/caldav-htpasswd" + Require valid-user + EOF # nginx version of above would be: # auth_basic "Not currently available"; # auth_basic_user_file /etc/nginx/caldav/htpasswd; - ########## begin pump.io setup ########## - # once pump adds a logrotation script, turn off nologger, - # and add - # "logfile": "/var/log/pumpio/pumpio.log", - # - s dd of=/etc/pump.io.json <<'EOF' -{ - "secret": "SECRET_REPLACE_ME", - "driver": "mongodb", - "params": { "dbname": "pumpio" }, - "noweb": false, - "site": "pump.iankelling.org", - "owner": "Ian Kelling", - "ownerURL": "https://iankelling.org/", - "port": 8001, - "urlPort": 443, - "hostname": "pump.iankelling.org", - "nologger": true, - "datadir": "/home/pumpio/pumpdata", - "enableUploads": true, - "debugClient": false, - "disableRegistration": true, - "noCDN": true, - "key": "/home/pumpio/privkey.pem", - "cert": "/home/pumpio/fullchain.pem", - "address": "localhost", - "sockjs": false -} -EOF - s sed -i "s#SECRET_REPLACE_ME#$(cat /p/c/machine_specific/li/pump-secret)#" /etc/pump.io.json - - # stretch node is too old - # https://nodejs.org/en/download/package-manager/ - curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - - pi nodejs graphicsmagick mongodb - cd /home/iank - if [[ -e pump.io ]]; then - cd pump.io - git pull - else - git clone https://github.com/pump-io/pump.io.git - cd pump.io - fi - # note: these 2 commands seem - # note: doing this or the npm install pump.io as root had problems. - npm install - npm run build - # normally, next command would be - # s npm install -g odb - # but it\'s this until a bug in pump gets fixed - # https://github.com/pump-io/pump.io/issues/1287 - s npm install -g databank-mongodb@0.19.2 - if ! getent passwd pumpio &>/dev/null; then - s useradd -Um -s /bin/false pumpio - fi - sudo -u pumpio mkdir -p /home/pumpio/pumpdata - # for testing browser when only listening to localhost, - # in the pump.io.json, set hostname localhost, urlPort 5233 - #ssh -L 5233:localhost:5233 li - - s mkdir -p /var/log/pumpio/ - s chown pumpio:pumpio /var/log/pumpio/ - - web-conf - apache2 pump.iankelling.org <<'EOF' -# currently a bug in pump that we cant terminate ssl - SSLProxyEngine On - ProxyPreserveHost On - ProxyPass / https://127.0.0.1:8001/ - ProxyPassReverse / https://127.0.0.1:8001/ - # i have sockjs disabled per people suggesting that - # it won\'t work with apache right now. - # not sure if it would work with this, - # but afaik, this is pointless atm. - - ProxyPass wss://127.0.0.1:8001/main/realtime/sockjs/ - ProxyPassReverse wss://127.0.0.1:8001/main/realtime/sockjs/ - -EOF + ###### begin znc setup ##### + pi znc + # https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart after cert change. + # to get into the web interface, + # then use non-main browser or else it doebsn't allow it based on ocsp stapling from my main site. + # https://iankelling.org:12533/ sudo -i <<'EOF' -export RENEWED_LINEAGE=/etc/letsencrypt/live/pump.iankelling.org +export RENEWED_LINEAGE=/etc/letsencrypt/live/iankelling.org /a/bin/distro-setup/certbot-renew-hook EOF - s dd of=/etc/systemd/system/pump.service <<'EOF' -[Unit] -Description=pump.io -After=syslog.target network.target mongodb.service -Requires=mongodb.service - -[Service] -Type=simple -User=pumpio -Group=pumpio -ExecStart=/home/iank/pump.io/bin/pump -Environment=NODE_ENV=production -# failed to find databank-mongodb without this. -# I just looked at my environment variables took a guess. -Environment=NODE_PATH=/usr/lib/nodejs:/usr/lib/node_modules:/usr/share/javascript - -[Install] -WantedBy=multi-user.target -EOF - ser daemon-reload - sgo pump - ########## end pump.io setup ############ - - - ############# begin setup mastodon ############## - - # main doc is Docker-Guide.md in docs repo - - # I'd like to try gnu social just cuz of gnu, but it's not being - # well maintained, for example, simple pull requests - # languishing: - # https://git.gnu.io/gnu/gnu-social/merge_requests/143 - # and I submitted my own bugs, basic docs are broken - # https://git.gnu.io/gnu/gnu-social/issues/269 - - # note, docker required, but we installed it earlier - - # i subscrubed to https://github.com/docker/compose/releases.atom - # to see release notes. - # i had some problems upgrading. blew things away with - # docker-compose down - # docker rmi $(docker images -q) - # s reboot now - # when running docker-compose run, kernel stack traces are printed to the journal. - # things seem to succeed, google says nothing, so ignoring them. - curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` | s dd of=/usr/local/bin/docker-compose - s chmod +x /usr/local/bin/docker-compose - - - cd ~ - s rm -rf mastodon - i clone https://github.com/tootsuite/mastodon - cd mastodon - # subbed to atom feed to deal with updates - git checkout $(git tag | grep -v rc | tail -n1) - - # per instructions, uncomment redis/postgres persistence in docker-compose.yml - sed -i 's/^#//' docker-compose.yml - - cat >.env.production <<'EOF' -REDIS_HOST=redis -REDIS_PORT=6379 -DB_HOST=db -DB_USER=postgres -DB_NAME=postgres -DB_PASS= -DB_PORT=5432 - -LOCAL_DOMAIN=mast.iankelling.org -LOCAL_HTTPS=true - -SINGLE_USER_MODE=true - -SMTP_SERVER=mail.iankelling.org -SMTP_PORT=25 -SMTP_LOGIN=li -SMTP_FROM_ADDRESS=notifications@mast.iankelling.org -SMTP_DOMAIN=mast.iankelling.org -SMTP_DELIVERY_METHOD=smtp -EOF - - for key in PAPERCLIP_SECRET SECRET_KEY_BASE OTP_SECRET; do - # 1 minute 7 seconds to run this docker command - # to generate a secret, and it has ^M chars at the end. wtf. really dumb - printf "%s=%s\n" $key "$(docker-compose run --rm web rake secret|dos2unix|tail -n1)" >>.env.production - done - found=false - while read -r domain port pass; do - if [[ $domain == mail.iankelling.org ]]; then - found=true - # remove the username part - pass="${pass#*:}" - printf "SMTP_PASSWORD=%s\n" "$pass" >>.env.production - break - fi - done < <(s cat /etc/mailpass) - if ! $found; then - echo "$0: error, failed to find mailpass domain for mastadon" - exit 1 - fi - - # docker compose makes an interface named like br-8f3e208558f2. we need mail to - # get routed to us. - if ! s /sbin/iptables -t nat -C PREROUTING -i br-+ -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25; then - s /sbin/iptables -t nat -A PREROUTING -i br-+ -p tcp -m tcp --dport 25 -j DNAT --to-destination 10.8.0.4:25 - fi - - docker-compose run --rm web rake mastodon:webpush:generate_vapid_key | grep -E '^VAPID_PUBLIC_KEY=|^VAPID_PRIVATE_KEY=' >> .env.production - logq docker-compose run --rm web rake db:migrate - docker-compose run --rm web rails assets:precompile - - # avatar failed to upload, did - # docker logs mastodon_web_1 - # google lead me to this - s chown -R 991:991 public/system - - # docker daemon takes care of starting on boot. - docker-compose up -d - - s a2enmod proxy_wstunnel headers - web-conf -f 3000 - apache2 mast.iankelling.org <<'EOF' - ProxyPreserveHost On - RequestHeader set X-Forwarded-Proto "https" - ProxyPass /500.html ! - ProxyPass /oops.png ! - ProxyPass /api/v1/streaming/ ws://localhost:4000/ - ProxyPassReverse /api/v1/streaming/ ws://localhost:4000/ - ErrorDocument 500 /500.html - ErrorDocument 501 /500.html - ErrorDocument 502 /500.html - ErrorDocument 503 /500.html - ErrorDocument 504 /500.html -EOF - - - ############### !!!!!!!!!!!!!!!!! - ############### manual steps: - - # only following a few people atm, so not bothering to figure out backups - # when mastodon has not documented it at all. - # - # fsf@status.fsf.org - # cwebber@toot.cat - # dbd@status.fsf.org - # johns@status.fsf.org - - # sign in page is at https://mast.iankelling.org/auth/sign_in - # register as iank, then - # https://github.com/tootsuite/documentation/blob/master/Running-Mastodon/Administration-guide.md - # docker-compose run --rm web bundle exec rails mastodon:make_admin USERNAME=iank - - ############# end setup mastodon ############## - - # we use nsupdate to update the ip of home - pi bind9 - - pi znc # znc config generated by doing # znc --makeconf # selected port is also used in erc config @@ -560,11 +532,6 @@ EOF # sed -i 's,/home/iank/.znc/,/var/lib/znc,' /var/lib/znc/config/znc.conf # and made a copy of the config files into /p/c # /msg *status LoadMod --type=global log -sanitize - # to get into the web interface, - # cat /etc/letsencrypt/live/iankelling.org/{privkey,cert,chain}.pem > /var/lib/znc/znc.pem - # then use non-main browser or else it doesn't allow it based on ocsp stapling from my main site. - # https://iankelling.org:12533/ - # i'm going to figure out how to automate this when it expires. i know i can hook a script into the renewal. https://wiki.znc.in/FAQ seems to imply that znc doesn\'t need restart. # todo: in config file AllowWeb = true should be false. better security if that is off unless we need it. # /msg *status LoadMod --type=network perform # /msg *perform add PRIVMSG ChanServ :invite #fsf-office @@ -577,12 +544,12 @@ EOF # on killing the, # an example seems to be here: https://github.com/zenspider/elisp/blob/master/rwd-irc.el # if that was the case i could remove the module clearbufferonmsg - # alo would be nice if erc supported + # also would be nice if erc supported # https://wiki.znc.in/self-message # https://wiki.znc.in/Query_buffers \ # s useradd --create-home -d /var/lib/znc --system --shell /sbin/nologin --comment "Account to run ZNC daemon" --user-group znc || [[ $? == 9 ]] # 9 if it exists already - chmod 700 /var/lib/znc + s chmod 700 /var/lib/znc s chown -R znc:znc /var/lib/znc s dd of=/etc/systemd/system/znc.service 2>/dev/null <<'EOF' [Unit] @@ -598,19 +565,41 @@ WantedBy=multi-user.target EOF ser daemon-reload sgo znc + ###### stop znc setup ##### - echo "$0: $(date): ending now)" - exit 0 + end ;; esac +###### end website setup ########### end section including li/lj ############### +#### desktop stuff +case $codename_compat in + xenial) + # mate-indicator-applet and beyond are msc things I noticed diffing a + # standard install with mine. + pi xorg lightdm mate-desktop-environment mate-desktop-environment-extras mate-indicator-applet anacron + ;; + stretch) + pi task-mate-desktop + ;; + buster) + # mate doesnt have wayland support yet + pi task-gnome-desktop + ;; +esac + + + + +# TODO: some of the X programs can be removed from pall when using wayland + # depends gcc is a way to install suggests. this is apparently the only # way to install suggests even if the main package is already # installed. reinstall doesn't work, uninstalling can cause removing # dependent packages. -pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') +pi ${pall[@]} $(apt-cache search ruby[.0-9]+-doc| awk '{print $1}') $(apt-cache depends gcc|grep -i suggests:| awk '{print $2}') $($src/distro-pkgs) if ! type pip; then x=$(mktemp) @@ -754,7 +743,7 @@ After=multi-user.target [Service] User=iank Type=oneshot -ExecStart=/a/bin/log-quiet/sysd-mail-once irc-backup rsync -rlptDhSAX --delete root@iankelling.org:/var/lib/znc/moddata/log/iank/freenode/ /k/irclogs +ExecStart=/a/bin/log-quiet/sysd-mail-once irc-backup rsync -rlptDhSAX root@iankelling.org:/var/lib/znc/moddata/log/iank/freenode/ /k/irclogs EOF s dd of=/etc/systemd/system/ircbackup.timer <<'EOF' [Unit] @@ -822,7 +811,7 @@ if [[ $HOSTNAME == frodo ]]; then # https://apt.syncthing.net/ curl -s https://syncthing.net/release-key.txt | sudo apt-key add - s="deb http://apt.syncthing.net/ syncthing release" - if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != $s ]]; then + if [[ $(cat /etc/apt/sources.list.d/syncthing.list) != "$s" ]]; then echo "$s" | s dd of=/etc/apt/sources.list.d/syncthing.list p update fi @@ -883,6 +872,13 @@ fi ####### begin misc packages ########### +case $codename in + flidas) + + ;; +esac + + # sakura config is owned by ian reset-sakura reset-konsole @@ -913,13 +909,13 @@ wget -O $t http://mirror.fsf.org/fsfsys-trisquel/fsfsys-trisquel/pool/main/s/spd s dpkg -i $t rm $t # this guesses at the appropriate directory, adjust if needed -x=(/usr/lib/x86_64-linux-gnu/perl/5.*) -sudo ln -sf ../../../perl/5.18.2/SPD/ $x +perldir=(/usr/lib/x86_64-linux-gnu/perl/5.*) +sudo ln -sf ../../../perl/5.18.2/SPD/ ${perldir[0]} # newer distro had gpg2 as default, older one, flidas, need to make it that way -x=$(which gpg2) +gpgpath=$(which gpg2) if [[ $x ]]; then s mkdir -p /usr/local/spdhackfix - s lnf -T $x /usr/local/spdhackfix/gpg + s lnf -T $gpgpath /usr/local/spdhackfix/gpg fi ### end spd install @@ -972,119 +968,6 @@ case $distro in # others unknown esac -case $(debian-codename) in - # needed for debootstrap scripts for fai since fai requires debian - flidas) - curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add - - s dd of=/etc/apt/preferences.d/flidas-xenial </dev/null <$t <$t < x.html -EOF - case $distro in trisquel|ubuntu|debian) @@ -1738,8 +1522,6 @@ EOF ;; esac -# note, for jessie, it depends on a higher version of btrfs-tools. -# # # disabled due to my patch being in btrbk # case $distro in # arch|debian|trisquel|ubuntu) pi btrbk ;; @@ -1748,13 +1530,9 @@ esac cd /a/opt/btrbk s make install -# ian: temporarily disabled while hosts are in flux. -# if [[ $HOSTNAME == tp ]]; then -# # backup/sync manually on others hosts for now. -# sgo btrbk.timer -# # note: to see when it was last run, -# # ser list-timers -# fi +sgo btrbk.timer +# note: to see when it was last run, +# ser list-timers end_msg <<'EOF' @@ -1776,6 +1554,28 @@ esac /a/bin/buildscripts/pithosfly + +# based on guix manual instructions, also added code to profile +pi nscd +if ! type -p guix >/dev/null; then + cd $(mktemp -d) + wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh + # added some stuff to envonment.sh for profile based on + # manual instructions + # wget https://sv.gnu.org/people/viewgpg.php?user_id=15145 -qO - | gpg --import - + # echo is to get past prompt + yes | sudo -E HOME=$HOME bash guix-install.sh || [[ $? == 141 ]] + guix install glibc-utf8-locales + guix package --install guile +fi + +# install rust. +curl https://sh.rustup.rs -sSf | bash -s -- -y +# todo: update this. updates in rust are stupidly complicate +if ! which rg &>/dev/null; then + cargo install ripgrep +fi + #### tor case $distro in # based on @@ -1847,16 +1647,12 @@ make sure to reload the firewall to load the persistent configuration EOF pi nfs-utils - sgo nfs-server ;; debian|trisquel|ubuntu) - pi nfs-server + pi-nostart nfs-server ;; arch) pi nfs-utils || pending_reboot=true - sgo rpcbind - # this failed until I rebooted - sgo nfs-server ;; esac @@ -1885,7 +1681,6 @@ EOF fi -e "$end_msg_var" @@ -1899,11 +1694,4 @@ e "$end_msg_var" ######### begin stuff belonging at the end ########## - -if $pending_reboot; then - echo "$0: pending reboot and then finished. doing it now." - s reboot now -else - echo "$0: $(date): ending now)" -fi -exit 0 +end