From 8f41e22a4386a0a5ac1ecf5df1fdc0a3e44b08a1 Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Fri, 21 Mar 2025 23:19:01 +0100 Subject: [PATCH] Restructure and tabula rasa. --- {bookworm => _bookworm}/apt-mark/all | 0 {bookworm => _bookworm}/apt-mark/h610m | 0 {bookworm => _bookworm}/apt-mark/seedbox | 0 {bookworm => _bookworm}/apt-mark/server | 0 {bookworm => _bookworm}/apt-mark/thinkpad | 0 {bookworm => _bookworm}/apt-mark/user | 0 {bookworm => _bookworm}/apt-mark/w530 | 0 {archived/buster => _bookworm}/apt-mark/web | 0 {bookworm => _bookworm}/borg.sh | 0 .../apt/apt.conf.d/99_minimize_dependencies | 0 .../etc_files/all/etc/apt/sources.list | 0 .../etc_files/all/etc/default/locale | 0 .../etc_files}/all/etc/locale.gen | 0 .../etc_files}/all/etc/timezone | 0 .../etc/systemd/system/rtorrent.service | 0 .../etc_files/server/etc/ssh/sshd_config | 0 .../status.plomlompom.com.nginx | 0 .../sites-available/tube.plomlompom.com.nginx | 0 .../etc_files/w530/etc/default/grub | 0 .../etc/modprobe.d/blacklist-nouveau.conf | 0 .../etc_files/web/etc/nftables.conf | 0 .../etc_files/web/etc/nginx/nginx.conf | 0 .../home_files/h610m/.xinitrc_bonus | 0 .../home_files/minimal/.bashrc | 0 .../home_files/root/.shell_prompt_color | 0 .../home_files/seedbox/.rtorrent.rc | 0 .../home_files/user/.Xresources | 0 .../home_files/user/.borgrepos | 0 .../home_files/user/.config/i3/config | 0 .../home_files/user}/.config/i3status/config | 0 .../home_files/user/.emacs.d/init.el | 0 .../home_files/user/.gitconfig | 0 .../home_files/user/.mbsyncrc | 0 .../home_files/user/.notmuch-config | 0 .../home_files/user/.shell_prompt_color | 0 .../home_files/user/.tridactylrc | 0 .../home_files/user/.xinitrc | 0 .../home_files/user/mail_sync.sh | 0 .../home_files/user/public_repos/repos | 0 .../home_files/w530/.config/i3/config_bonus | 0 .../home_files/w530/.xinitrc_bonus | 0 .../setup_scripts/_setup.sh | 0 .../setup_scripts/copy_dirtree.sh | 0 .../init_user_and_keybased_login.sh | 0 .../setup_scripts/init_user_login.sh | 0 .../setup_scripts/install_for_target.sh | 0 .../setup_scripts/migrate_borg.sh | 0 .../setup_scripts/mirror_dir.sh | 0 {bookworm => _bookworm}/setup_scripts/misc.sh | 0 .../setup_scripts/prepare_to_meet_server.sh | 0 .../setup_scripts/purge_nonrequireds.sh | 0 .../setup_scripts/set_hostname_and_fqdn.sh | 0 .../setup_scripts/setup_desktop.sh | 0 .../setup_scripts/setup_firefox.sh | 0 .../setup_scripts/setup_home.sh | 0 .../setup_scripts/setup_nvidia.sh | 0 .../setup_scripts/setup_seedbox.sh | 0 .../setup_scripts/setup_server.sh | 0 .../setup_scripts/setup_static_website.sh | 0 .../setup_scripts/setup_web.sh | 0 .../upgrade_from_older_release.sh | 0 constants.sh => archived/__constants.sh | 0 .../__many_releases}/aptmark/all | 0 .../__many_releases}/aptmark/raspi | 0 .../apt/apt.conf.d/99_minimize_dependencies | 0 .../__many_releases}/etc/all/locale.conf | 0 .../etc/all}/locale.gen | 0 .../etc => __many_releases/etc/all}/timezone | 0 .../etc/raspi/greetd/config.toml | 0 .../etc/raspi/ssh/sshd_config | 0 .../raspi/systemd/system/throttle_cpu.service | 0 .../__many_releases}/home/all/.bashrc | 0 .../__many_releases/home/all}/.gitconfig | 0 .../home/raspi/.config/mpv/mpv.conf | 0 .../home/raspi/.config/sway/config | 0 .../raspi/.nonpath_bins/on_session_start.sh | 0 .../home/raspi/.nonpath_bins/status.sh | 0 .../__many_releases}/home/raspi/.profile | 0 .../home/raspi_root/throttle_cpu.sh | 0 .../home}/root/.shell_prompt_color | 0 .../__many_releases}/scripts/_misc.sh | 0 archived/all_new_2018/apt-mark/all | 9 - archived/all_new_2018/apt-mark/server | 7 - archived/all_new_2018/borg.sh | 145 ------ .../all/etc/apt/sources.list | 4 - .../linkable_etc_files/mail/etc/aliases | 23 - .../mail/etc/dovecot/conf.d/99-auth.conf | 3 - .../mail/etc/dovecot/conf.d/99-lmtp.conf | 4 - .../mail/etc/dovecot/conf.d/99-mail.conf | 1 - .../mail/etc/dovecot/conf.d/99-master.conf | 20 - .../mail/etc/dovecot/conf.d/99-ssl.conf | 1 - .../mail/etc/iptables/rules.v4 | 20 - .../mail/etc/mailutils.conf | 4 - .../linkable_etc_files/mail/etc/opendkim.conf | 86 ---- .../mail/etc/postfix/main.cf | 59 --- .../mail/etc/postfix/master.cf | 124 ----- .../mail/etc/systemd/system/fetchmail.service | 8 - .../mail/etc/systemd/system/pingmail.service | 7 - .../timers.target.wants/fetchmail.timer | 8 - .../system/timers.target.wants/pingmail.timer | 8 - .../systemd/system/encrypt_chatlogs.service | 6 - .../linkable_etc_files/sendonly/etc/aliases | 3 - .../sendonly/etc/postfix/main.cf | 38 -- .../server/etc/iptables/rules.v4 | 14 - .../server/etc/ssh/sshd_config | 126 ----- .../linkable_etc_files/web/etc/cron.d/certbot | 17 - .../linkable_etc_files/web/etc/gitweb.conf | 19 - .../web/etc/iptables/rules.v4 | 18 - .../web/etc/nginx/nginx.conf | 84 --- .../web/etc/systemd/system/certbot.service | 11 - .../setup_scripts/add_encryption_key.sh | 30 -- .../setup_scripts/hardlink_etc.sh | 24 - .../init_user_and_keybased_login.sh | 52 -- .../setup_scripts/install_for_target.sh | 19 - .../all_new_2018/setup_scripts/letsencrypt.sh | 31 -- .../setup_scripts/letsencrypt_get.sh | 20 - .../setup_scripts/prepare_to_meet_server.sh | 18 - .../setup_scripts/purge_nonrequireds.sh | 26 - .../setup_scripts/set_hostname_and_fqdn.sh | 45 -- .../all_new_2018/setup_scripts/setup_mail.sh | 94 ---- .../all_new_2018/setup_scripts/setup_play.sh | 36 -- .../setup_scripts/setup_plomlombot.sh | 29 -- .../setup_scripts/setup_sendonly.sh | 14 - .../setup_scripts/setup_server.sh | 52 -- .../all_new_2018/setup_scripts/setup_web.sh | 19 - .../all_new_2018/user_files/dovecot.sieve | 8 - archived/all_new_2018/user_files/encrypter.sh | 9 - archived/all_new_2018/user_files/fetchmailrc | 2 - archived/all_new_2018/user_files/pingmailrc | 45 -- .../user_files/plomlombot_daemon.sh | 55 -- .../user_files/weechat-wrapper.sh | 8 - archived/all_new_2018/user_files/weechatrc | 7 - archived/ansible/config.yml | 117 ----- archived/ansible/config_new.yml | 147 ------ .../ansible/files/apt-mark/3d_acceleration | 5 - archived/ansible/files/apt-mark/basic_x_tools | 7 - .../files/apt-mark/browser_environment | 4 - archived/ansible/files/apt-mark/console | 2 - archived/ansible/files/apt-mark/core | 55 -- archived/ansible/files/apt-mark/hotkeys | 1 - archived/ansible/files/apt-mark/man | 2 - .../apt-mark/minimal_ansible_environment | 3 - archived/ansible/files/apt-mark/minimal_x | 4 - archived/ansible/files/apt-mark/multimedia | 6 - .../ansible/files/apt-mark/power_management | 2 - .../ansible/files/apt-mark/various_useful | 5 - archived/ansible/files/apt-mark/wifi | 4 - .../files/apt-mark_new/W530/3d_acceleration | 3 - .../apt-mark_new/W530/browser_environment | 4 - .../ansible/files/apt-mark_new/W530/hotkeys | 1 - .../files/apt-mark_new/W530/multimedia | 3 - archived/ansible/files/apt-mark_new/W530/wicd | 3 - .../files/apt-mark_new/X200s/multimedia | 4 - .../files/apt-mark_new/X200s/power_management | 2 - .../ansible/files/apt-mark_new/X200s/wifi | 1 - .../apt-mark_new/minimal/3d_acceleration | 2 - .../files/apt-mark_new/minimal/basic_x_tools | 7 - .../apt-mark_new/minimal/browser_environment | 1 - .../files/apt-mark_new/minimal/console | 2 - .../ansible/files/apt-mark_new/minimal/core | 55 -- .../apt-mark_new/minimal/disk_encryption | 2 - .../ansible/files/apt-mark_new/minimal/man | 2 - .../minimal/minimal_ansible_environment | 3 - .../files/apt-mark_new/minimal/minimal_x | 4 - .../files/apt-mark_new/minimal/multimedia | 3 - .../apt-mark_new/minimal/power_management | 2 - .../files/apt-mark_new/minimal/various_useful | 5 - .../ansible/files/apt-mark_new/minimal/wifi | 1 - .../console/___etc___default___console-setup | 4 - .../files/console/___etc___default___keyboard | 4 - archived/ansible/files/dirs | 2 - archived/ansible/files/dirs_new | 1 - .../___etc___X11___xorg.conf.forced_nvidia | 34 -- ...etc___acpi___events___plom-brightness-down | 2 - ...__etc___acpi___events___plom-brightness-up | 2 - .../___etc___acpi___events___plom-micmute | 2 - .../system/___etc___acpi___events___plom-mute | 2 - .../___etc___acpi___events___plom-volume-down | 2 - .../___etc___acpi___events___plom-volume-up | 2 - .../___etc___apt___apt.conf.d___99mindeps | 4 - .../files/system/___etc___apt___sources.list | 4 - .../files/system/___etc___default___tlp | 278 ---------- .../ansible/files/system/___etc___hostname | 1 - archived/ansible/files/system/___etc___hosts | 7 - .../ansible/files/system/___etc___profile | 35 -- .../system/___etc___systemd___logind.conf | 38 -- .../ansible/files/system/___etc___timezone | 1 - .../___etc___wicd___manager-settings.conf | 24 - .../___etc___X11___xorg.conf.forced_nvidia | 34 -- .../files/system_new/W530/___etc___hostname | 1 - .../files/system_new/W530/___etc___hosts | 7 - .../___etc___wicd___manager-settings.conf | 24 - .../files/system_new/X200s/___etc___hostname | 1 - .../files/system_new/X200s/___etc___hosts | 7 - .../___etc___apt___apt.conf.d___99mindeps | 4 - .../minimal/___etc___apt___sources.list | 4 - ...etc___apt___sources.list.d___palemoon.list | 1 - .../system_new/minimal/___etc___default___tlp | 278 ---------- .../files/system_new/minimal/___etc___profile | 35 -- .../minimal/___etc___systemd___logind.conf | 38 -- .../system_new/minimal/___etc___timezone | 1 - archived/ansible/run_root.sh | 1 - archived/ansible/run_root_new.sh | 1 - archived/ansible/run_user.sh | 1 - archived/ansible/run_user_new.sh | 1 - archived/ansible/tasks/initial_purge.yml | 25 - archived/ansible/tasks/qutebrowser.yml | 45 -- archived/ansible/user.yml | 13 - archived/ansible/user_new.yml | 13 - archived/archive_plomroma.py | 86 ---- archived/bin/broiler_in.sh | 3 - archived/bin/hubbabubba.sh | 3 - archived/bin/i3status_wrapper.py | 26 - archived/bin/install_certs.sh | 7 - archived/bin/network.sh | 65 --- archived/bin/plomlombot.sh | 3 - archived/bin/renew_certs.sh | 5 - archived/bin/setup_opendkim.sh | 65 --- archived/bin/setup_starttls.sh | 38 -- archived/bin/simplemail.sh | 9 - archived/bin/simplemail_out.sh | 9 - archived/bin/start_htwtxt.sh | 8 - archived/bin/symlink.sh | 41 -- archived/bin/w530_backlight.sh | 32 -- archived/bin/w530_startx_force_nvidia.sh | 13 - archived/bin/weechat-wrapper.sh | 8 - archived/bin/wicd-wrapper.sh | 67 --- archived/bin/zinskritik.sh | 3 - archived/{buster => bullseye}/apt-mark/all | 0 .../{buster => bullseye}/apt-mark/desktop | 0 .../{buster => bullseye}/apt-mark/dumpsite | 0 .../bullseye}/apt-mark/microblogpub | 0 archived/{buster => bullseye}/apt-mark/play | 0 archived/{buster => bullseye}/apt-mark/server | 0 .../{buster => bullseye}/apt-mark/thinkpad | 0 {bullseye => archived/bullseye}/apt-mark/user | 0 archived/{buster => bullseye}/apt-mark/w530 | 0 {bookworm => archived/bullseye}/apt-mark/web | 0 .../bullseye}/apt-mark/website | 0 {bullseye => archived/bullseye}/borg.sh | 0 .../apt/apt.conf.d/99_minimize_dependencies | 0 .../etc_files/all/etc/apt/sources.list | 0 .../etc_files/all/etc/default/locale | 0 .../bullseye}/etc_files/all/etc/locale.gen | 0 .../bullseye}/etc_files/all/etc/timezone | 0 .../etc/systemd/system/reboot.service | 0 .../etc/systemd/system/reboot.timer | 0 .../etc/nginx/sites-available/dumpsite.nginx | 0 .../etc/systemd/system/url_catcher.service | 0 .../microblogpub/etc/apt/sources.list | 0 .../nginx/sites-available/microblogpub.nginx | 0 .../etc/systemd/system/microblogpub.service | 0 .../systemd/system/microblogpub_prune.service | 0 .../systemd/system/microblogpub_prune.timer | 0 .../systemd/system/encrypt_chatlogs.service | 0 .../systemd/system}/encrypt_chatlogs.timer | 0 .../etc_files/server/etc/ssh/sshd_config | 0 .../etc_files/thinkpad/etc/default/tlp | 0 .../etc_files/thinkpad/etc/network/interfaces | 0 .../thinkpad/etc/systemd/logind.conf | 0 .../bullseye}/etc_files/web/etc/nftables.conf | 0 .../etc_files/web/etc/nginx/nginx.conf | 0 .../etc_files/website/etc/gitweb.conf | 0 .../etc/nginx/sites-available/website.nginx | 0 .../etc/systemd/system/plomlombot.service | 0 .../bullseye}/home_files/minimal/.bashrc | 0 .../home_files/root/.shell_prompt_color | 0 .../bullseye}/home_files/user/.Xresources | 0 .../bullseye}/home_files/user/.borgrepos | 0 .../home_files/user/.config/i3/config | 0 .../home_files/user/.emacs.d/init.el | 0 .../bullseye}/home_files/user/.gitconfig | 0 .../home_files/user/.mbsyncrc | 0 .../bullseye}/home_files/user/.notmuch-config | 0 .../home_files/user/.shell_prompt_color | 0 .../home_files/user/.tridactylrc | 0 .../home_files/user/.xinitrc | 0 .../home_files/user/mail_sync.sh | 0 .../home_files/user/public_repos/repos | 0 .../home_files/w530}/.config/i3status/config | 0 .../home_files/x220/.config/i3status/config | 0 .../other_files}/blank.html | 0 .../other_files/blog_hook_post-receive | 0 .../other_files/dumpsite_index.html | 0 .../other_files/plomlombot_daemon.sh | 0 .../other_files/plomlombot_hook_post-receive | 0 .../other_files/prune_microblogpub.sh | 0 .../url-catcher_customizations.json | 0 .../other_files/website_hook_post-receive | 0 .../other_files/weechat-wrapper.sh | 0 .../other_files/weechatlogs_encrypter.sh | 0 .../bullseye}/other_files/weechatrc | 0 .../other_files/zettel_hook_post-receive | 0 .../setup_scripts/copy_dirtree.sh | 0 .../init_user_and_keybased_login.sh | 0 .../setup_scripts/init_user_login.sh | 0 .../setup_scripts/install_for_target.sh | 0 .../bullseye}/setup_scripts/migrate_borg.sh | 0 .../setup_scripts/mirror_dir.sh | 0 .../bullseye}/setup_scripts/misc.sh | 0 .../setup_scripts/prepare_to_meet_server.sh | 0 .../setup_scripts/purge_nonrequireds.sh | 0 .../setup_scripts/set_hostname_and_fqdn.sh | 0 .../bullseye}/setup_scripts/setup.sh | 0 .../setup_scripts/setup_daily_reboot.sh | 0 .../bullseye}/setup_scripts/setup_desktop.sh | 0 .../bullseye}/setup_scripts/setup_dumpsite.sh | 0 .../bullseye}/setup_scripts/setup_firefox.sh | 0 .../bullseye}/setup_scripts/setup_home.sh | 0 .../setup_scripts/setup_microblogpub.sh | 0 .../bullseye}/setup_scripts/setup_play.sh | 0 .../bullseye}/setup_scripts/setup_server.sh | 0 .../bullseye}/setup_scripts/setup_website.sh | 0 archived/buster/apt-mark/eeepc | 3 - archived/buster/apt-mark/mail | 17 - archived/buster/apt-mark/old_server | 2 - archived/buster/apt-mark/peertube | 15 - archived/buster/apt-mark/pleroma | 5 - archived/buster/apt-mark/pleroma_otp | 4 - archived/buster/apt-mark/pleroma_source | 4 - archived/buster/apt-mark/seedbox | 8 - archived/buster/apt-mark/user | 77 --- archived/buster/apt-mark/website | 8 - archived/buster/apt-mark/x200s | 0 .../buster/etc_files/all/etc/apt/sources.list | 4 - .../etc/nginx/sites-available/dumpsite.nginx | 28 - .../etc_files/eeepc/etc/systemd/logind.conf | 8 - archived/buster/etc_files/mail/etc/aliases | 24 - .../conf.d/99-lmtp-sieve-filtering.conf | 18 - .../mail/etc/dovecot/conf.d/99-smtp-sasl.conf | 10 - .../buster/etc_files/mail/etc/mailutils.conf | 4 - .../buster/etc_files/mail/etc/nftables.conf | 24 - .../system/fetchmail_old_account.service | 8 - .../system/fetchmail_old_account.timer | 8 - .../mail/etc/systemd/system/pingmail.service | 7 - .../mail/etc/systemd/system/pingmail.timer | 8 - .../etc_files/old_server/etc/apt/sources.list | 4 - .../etc/systemd/system/encrypt_chatlogs.timer | 8 - .../lib/pleroma/static/instance/panel.html | 4 - .../pleroma/var/lib/pleroma/static/robots.txt | 2 - .../static/static/terms-of-service.html | 1 - .../buster/etc_files/server/etc/nftables.conf | 20 - .../etc_files/server/etc/ssh/sshd_config | 124 ----- .../etc_files/user/etc/cups/printers.conf | 20 - .../etc_files/user/etc/default/console-setup | 4 - .../opt/firefox/defaults/pref/autoconfig.js | 4 - .../etc_files/user/opt/firefox/firefox.cfg | 18 - .../usr/share/applications/firefox.desktop | 3 - .../etc/nginx/sites-available/website.nginx | 40 -- .../etc/systemd/system/plomlombot.service | 11 - .../x200s/etc/wicd/manager-settings.conf | 24 - .../x220/etc/wicd/manager-settings.conf | 24 - .../home_files/eeepc/.config/i3status/config | 82 --- archived/buster/home_files/minimal/.bashrc | 26 - .../buster/home_files/user/.config/i3/config | 83 --- .../buster/home_files/user/.emacs.d/init.el | 323 ------------ .../home_files/x200s/.config/i3status/config | 82 --- .../buster/other_files/append_opendkim.conf | 6 - .../buster/other_files/append_pleroma_config | 24 - .../buster/other_files/append_postfix_main.cf | 23 - .../other_files/append_postfix_master.cf | 4 - archived/buster/other_files/dovecot.sieve | 8 - archived/buster/other_files/fetchmailrc | 2 - .../other_files/peertube_production.yaml | 375 -------------- archived/buster/other_files/pingmailrc | 45 -- archived/buster/other_files/pixel.png | Bin 146 -> 0 bytes .../buster/other_files/pleroma_panel.html | 4 - .../buster/other_files/pleroma_robots.txt | 2 - .../other_files/pleroma_terms-of-service.html | 1 - .../buster/other_files/plomlombot_daemon.sh | 62 --- archived/buster/other_files/weechatrc | 8 - archived/buster/setup_scripts/backup_app.sh | 29 -- .../init_user_and_keybased_login.sh | 56 -- .../buster/setup_scripts/init_user_login.sh | 35 -- .../setup_scripts/install_for_target.sh | 20 - archived/buster/setup_scripts/migrate_app.sh | 39 -- archived/buster/setup_scripts/migrate_borg.sh | 17 - archived/buster/setup_scripts/mirror_dir.sh | 23 - .../setup_scripts/purge_nonrequireds.sh | 30 -- archived/buster/setup_scripts/restore_app.sh | 53 -- archived/buster/setup_scripts/setup.sh | 39 -- .../buster/setup_scripts/setup_desktop.sh | 94 ---- .../buster/setup_scripts/setup_dumpsite.sh | 102 ---- archived/buster/setup_scripts/setup_home.sh | 102 ---- archived/buster/setup_scripts/setup_mail.sh | 121 ----- .../buster/setup_scripts/setup_peertube.sh | 76 --- archived/buster/setup_scripts/setup_play.sh | 55 -- .../buster/setup_scripts/setup_pleroma_otp.sh | 94 ---- .../setup_scripts/setup_pleroma_source.sh | 94 ---- .../buster/setup_scripts/setup_seedbox.sh | 12 - archived/buster/setup_scripts/setup_server.sh | 26 - .../buster/setup_scripts/setup_website.sh | 137 ----- .../setup_scripts/update_pleroma_source.sh | 9 - .../buster/setup_scripts/upgrade_peertube.sh | 48 -- archived/dotfiles/minimal/bashrc | 9 - archived/dotfiles/minimal/gitconfig | 3 - archived/dotfiles/minimal/profile | 8 - archived/dotfiles/minimal/shinit | 37 -- archived/dotfiles/minimal/vimrc | 30 -- archived/dotfiles/root/shinit_color | 1 - archived/dotfiles/root/vimrc_add | 0 .../dotfiles/user/server/minimal/mailfilter | 25 - archived/dotfiles/user/server/minimal/muttrc | 66 --- .../dotfiles/user/server/minimal/vimrc_add | 0 .../server/personal/minimal/getmail/getmailrc | 17 - .../user/server/personal/minimal/procmailrc | 72 --- .../user/server/personal/minimal/shinit_add | 4 - .../user/server/personal/minimal/weechatrc | 13 - .../personal/plomlompom.com/shinit_color | 1 - .../personal/test.plomlompom.com/shinit_color | 1 - .../dotfiles/user/server/public/shinit_add | 4 - .../dotfiles/user/server/public/shinit_color | 1 - .../user/thinkpad/W530/Xresources-local | 40 -- .../dotfiles/user/thinkpad/W530/i3status.conf | 88 ---- .../user/thinkpad/X200s/Xresources-local | 34 -- .../user/thinkpad/X200s/i3status.conf | 62 --- .../dotfiles/user/thinkpad/minimal/Xresources | 7 - archived/dotfiles/user/thinkpad/minimal/i3 | 84 --- .../user/thinkpad/minimal/pentadactylrc | 20 - .../user/thinkpad/minimal/shinit_color | 1 - .../dotfiles/user/thinkpad/minimal/vimrc_add | 1 - .../dotfiles/user/thinkpad/minimal/xinitrc | 32 -- archived/jessie_postinstall.sh | 338 ------------ archived/mails/htwtxt_restart | 5 - archived/mails/server_postinstall_finished | 23 - archived/mails/update_reminder | 7 - archived/mails/weechat_restart_reminder | 5 - misc.sh => archived/misc.sh | 0 archived/notes | 54 -- archived/raspbian/.alsoftrc | 3 - archived/raspbian/.asoundrc | 73 --- archived/raspbian/.bash_aliases | 11 - archived/setup_go.sh | 44 -- archived/stretch/apt-mark/seedbox | 8 - .../etc_files/server/etc/ssh/sshd_config | 126 ----- .../init_user_and_keybased_login.sh | 56 -- .../setup_scripts/install_for_target.sh | 20 - .../stretch/setup_scripts/setup_seedbox.sh | 13 - archived/systemfiles/aliases | 23 - .../htwtxt_restart_reminder.service | 12 - archived/systemfiles/main.cf | 16 - archived/systemfiles/nginx.conf | 90 ---- archived/systemfiles/opendkim.conf | 22 - archived/systemfiles/plomlombot.service | 12 - archived/systemfiles/post-update | 5 - archived/systemfiles/weechat.service | 12 - {testing => archived/testing}/apt-mark/all | 0 {testing => archived/testing}/apt-mark/h610m | 0 {testing => archived/testing}/apt-mark/t490s | 0 {testing => archived/testing}/apt-mark/user | 0 {testing => archived/testing}/aptmark/h610m | 0 {testing => archived/testing}/aptmark/server | 0 .../apt/apt.conf.d/99_minimize_dependencies | 0 .../etc_files/all/etc/apt/sources.list | 0 .../testing}/etc_files/all/etc/default/locale | 0 .../testing}/etc_files/all/etc/locale.gen | 0 .../testing}/etc_files/all/etc/timezone | 0 .../testing}/home_files/h610m/.xinitrc_bonus | 0 .../testing}/home_files/minimal/.bashrc | 0 .../home_files}/root/.shell_prompt_color | 0 .../testing}/home_files/user/.Xresources | 0 .../testing}/home_files/user/.borgrepos | 0 .../home_files/user/.config/i3/config | 0 .../home_files/user/.config/i3status/config | 0 .../testing}/home_files/user/.emacs.d/init.el | 0 .../testing/home_files/user}/.gitconfig | 0 .../testing}/home_files/user/.mbsyncrc | 0 .../testing}/home_files/user/.notmuch-config | 0 .../home_files/user/.shell_prompt_color | 0 .../testing}/home_files/user/.tridactylrc | 0 .../testing}/home_files/user/.xinitrc | 0 .../testing}/home_files/user/mail_sync.sh | 0 .../home_files/user/public_repos/repos | 0 .../testing/scripts/__setup_raspi.sh | 0 .../testing}/setup_scripts/_setup.sh | 0 .../testing}/setup_scripts/copy_dirtree.sh | 0 .../setup_scripts/install_for_target.sh | 0 .../testing}/setup_scripts/misc.sh | 0 .../setup_scripts/purge_nonrequireds.sh | 0 .../setup_scripts/set_hostname_and_fqdn.sh | 0 .../testing}/setup_scripts/setup_desktop.sh | 0 .../testing}/setup_scripts/setup_home.sh | 0 archived/update_key.sh | 14 - bullseye/apt-mark/all | 12 - bullseye/apt-mark/desktop | 2 - bullseye/apt-mark/dumpsite | 13 - bullseye/apt-mark/play | 4 - bullseye/apt-mark/server | 6 - bullseye/apt-mark/thinkpad | 7 - bullseye/apt-mark/w530 | 0 bullseye/apt-mark/web | 4 - .../etc/systemd/system/url_catcher.service | 12 - .../systemd/system/encrypt_chatlogs.service | 6 - .../etc/systemd/system/encrypt_chatlogs.timer | 8 - bullseye/etc_files/thinkpad/etc/default/tlp | 306 ----------- .../thinkpad/etc/systemd/logind.conf | 6 - bullseye/etc_files/web/etc/nftables.conf | 22 - bullseye/etc_files/web/etc/nginx/nginx.conf | 38 -- bullseye/etc_files/website/etc/gitweb.conf | 22 - .../etc/systemd/system/plomlombot.service | 11 - bullseye/home_files/user/.mbsyncrc | 28 - bullseye/home_files/user/.tridactylrc | 13 - bullseye/home_files/user/.xinitrc | 17 - bullseye/home_files/user/mail_sync.sh | 43 -- bullseye/home_files/user/public_repos/repos | 7 - .../home_files/w530/.config/i3status/config | 82 --- bullseye/other_files/blank.html | 1 - bullseye/other_files/blog_hook_post-receive | 17 - bullseye/other_files/dumpsite_index.html | 3 - .../other_files/plomlombot_hook_post-receive | 2 - .../url-catcher_customizations.json | 13 - .../other_files/website_hook_post-receive | 2 - bullseye/other_files/weechat-wrapper.sh | 7 - bullseye/other_files/weechatlogs_encrypter.sh | 16 - bullseye/other_files/zettel_hook_post-receive | 5 - bullseye/setup_scripts/copy_dirtree.sh | 30 -- bullseye/setup_scripts/mirror_dir.sh | 23 - .../setup_scripts/prepare_to_meet_server.sh | 22 - .../setup_scripts/set_hostname_and_fqdn.sh | 50 -- testing/aptmark/all | 3 +- testing/aptmark/desktop | 4 + testing/aptmark/user | 3 - .../apt/apt.conf.d/99_minimize_dependencies | 0 .../default/locale => etc/all/locale.conf} | 0 {many_releases => testing}/etc/all/locale.gen | 0 {many_releases => testing}/etc/all/timezone | 0 .../etc/{t490s => desktop}/network/interfaces | 0 .../apt/apt.conf.d/99_minimize_dependencies | 4 - testing/etc_files/all/etc/locale.gen | 483 ------------------ testing/etc_files/all/etc/timezone | 1 - .../desktop/.nonpath_bins/plomlib.sh.desktop | 1 - .../root/.shell_prompt_color | 0 testing/{home_files => home}/user/.gitconfig | 0 .../user/.shell_prompt_color | 0 testing/home_files/user/.Xresources | 56 -- testing/home_files/user/.borgrepos | 4 - .../home_files/user/.config/i3status/config | 82 --- testing/home_files/user/.notmuch-config | 9 - testing/scripts/_config_scripts_lib.sh | 42 ++ testing/scripts/_misc.sh | 50 -- testing/scripts/_setup_secrets_user.sh | 15 +- testing/scripts/setup_desktop.sh | 235 ++++++--- testing/scripts/setup_secrets.sh | 10 +- 543 files changed, 226 insertions(+), 9834 deletions(-) rename {bookworm => _bookworm}/apt-mark/all (100%) rename {bookworm => _bookworm}/apt-mark/h610m (100%) rename {bookworm => _bookworm}/apt-mark/seedbox (100%) rename {bookworm => _bookworm}/apt-mark/server (100%) rename {bookworm => _bookworm}/apt-mark/thinkpad (100%) rename {bookworm => _bookworm}/apt-mark/user (100%) rename {bookworm => _bookworm}/apt-mark/w530 (100%) rename {archived/buster => _bookworm}/apt-mark/web (100%) rename {bookworm => _bookworm}/borg.sh (100%) rename {archived/all_new_2018/linkable_etc_files => _bookworm/etc_files}/all/etc/apt/apt.conf.d/99_minimize_dependencies (100%) rename {bookworm => _bookworm}/etc_files/all/etc/apt/sources.list (100%) rename {archived/buster => _bookworm}/etc_files/all/etc/default/locale (100%) rename {archived/all_new_2018/linkable_etc_files => _bookworm/etc_files}/all/etc/locale.gen (100%) rename {archived/all_new_2018/linkable_etc_files => _bookworm/etc_files}/all/etc/timezone (100%) rename {bookworm => _bookworm}/etc_files/seedbox/etc/systemd/system/rtorrent.service (100%) rename {bookworm => _bookworm}/etc_files/server/etc/ssh/sshd_config (100%) rename {bookworm => _bookworm}/etc_files/status.plomlompom.com/etc/nginx/sites-available/status.plomlompom.com.nginx (100%) rename {bookworm => _bookworm}/etc_files/tube.plomlompom.com/etc/nginx/sites-available/tube.plomlompom.com.nginx (100%) rename {bookworm => _bookworm}/etc_files/w530/etc/default/grub (100%) rename {bookworm => _bookworm}/etc_files/w530/etc/modprobe.d/blacklist-nouveau.conf (100%) rename {archived/buster => _bookworm}/etc_files/web/etc/nftables.conf (100%) rename {archived/buster => _bookworm}/etc_files/web/etc/nginx/nginx.conf (100%) rename {bookworm => _bookworm}/home_files/h610m/.xinitrc_bonus (100%) rename {bookworm => _bookworm}/home_files/minimal/.bashrc (100%) rename {archived/buster => _bookworm}/home_files/root/.shell_prompt_color (100%) rename {bookworm => _bookworm}/home_files/seedbox/.rtorrent.rc (100%) rename {archived/buster => _bookworm}/home_files/user/.Xresources (100%) rename {archived/buster => _bookworm}/home_files/user/.borgrepos (100%) rename {bookworm => _bookworm}/home_files/user/.config/i3/config (100%) rename {archived/buster/home_files/w530 => _bookworm/home_files/user}/.config/i3status/config (100%) rename {bookworm => _bookworm}/home_files/user/.emacs.d/init.el (100%) rename {archived/buster => _bookworm}/home_files/user/.gitconfig (100%) rename {bookworm => _bookworm}/home_files/user/.mbsyncrc (100%) rename {archived/buster => _bookworm}/home_files/user/.notmuch-config (100%) rename {archived/buster => _bookworm}/home_files/user/.shell_prompt_color (100%) rename {bookworm => _bookworm}/home_files/user/.tridactylrc (100%) rename {bookworm => _bookworm}/home_files/user/.xinitrc (100%) rename {bookworm => _bookworm}/home_files/user/mail_sync.sh (100%) rename {bookworm => _bookworm}/home_files/user/public_repos/repos (100%) rename {bookworm => _bookworm}/home_files/w530/.config/i3/config_bonus (100%) rename {bookworm => _bookworm}/home_files/w530/.xinitrc_bonus (100%) rename {bookworm => _bookworm}/setup_scripts/_setup.sh (100%) rename {bookworm => _bookworm}/setup_scripts/copy_dirtree.sh (100%) rename {bookworm => _bookworm}/setup_scripts/init_user_and_keybased_login.sh (100%) rename {bookworm => _bookworm}/setup_scripts/init_user_login.sh (100%) rename {bookworm => _bookworm}/setup_scripts/install_for_target.sh (100%) rename {bookworm => _bookworm}/setup_scripts/migrate_borg.sh (100%) rename {bookworm => _bookworm}/setup_scripts/mirror_dir.sh (100%) rename {bookworm => _bookworm}/setup_scripts/misc.sh (100%) rename {bookworm => _bookworm}/setup_scripts/prepare_to_meet_server.sh (100%) rename {bookworm => _bookworm}/setup_scripts/purge_nonrequireds.sh (100%) rename {bookworm => _bookworm}/setup_scripts/set_hostname_and_fqdn.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_desktop.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_firefox.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_home.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_nvidia.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_seedbox.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_server.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_static_website.sh (100%) rename {bookworm => _bookworm}/setup_scripts/setup_web.sh (100%) rename {bookworm => _bookworm}/setup_scripts/upgrade_from_older_release.sh (100%) rename constants.sh => archived/__constants.sh (100%) rename {many_releases => archived/__many_releases}/aptmark/all (100%) rename {many_releases => archived/__many_releases}/aptmark/raspi (100%) rename archived/{buster/etc_files/all/etc => __many_releases/etc/all}/apt/apt.conf.d/99_minimize_dependencies (100%) rename {many_releases => archived/__many_releases}/etc/all/locale.conf (100%) rename archived/{buster/etc_files/all/etc => __many_releases/etc/all}/locale.gen (100%) rename archived/{buster/etc_files/all/etc => __many_releases/etc/all}/timezone (100%) rename {many_releases => archived/__many_releases}/etc/raspi/greetd/config.toml (100%) rename {many_releases => archived/__many_releases}/etc/raspi/ssh/sshd_config (100%) rename {many_releases => archived/__many_releases}/etc/raspi/systemd/system/throttle_cpu.service (100%) rename {many_releases => archived/__many_releases}/home/all/.bashrc (100%) rename {bookworm/home_files/user => archived/__many_releases/home/all}/.gitconfig (100%) rename {many_releases => archived/__many_releases}/home/raspi/.config/mpv/mpv.conf (100%) rename {many_releases => archived/__many_releases}/home/raspi/.config/sway/config (100%) rename {many_releases => archived/__many_releases}/home/raspi/.nonpath_bins/on_session_start.sh (100%) rename {many_releases => archived/__many_releases}/home/raspi/.nonpath_bins/status.sh (100%) rename {many_releases => archived/__many_releases}/home/raspi/.profile (100%) rename {many_releases => archived/__many_releases}/home/raspi_root/throttle_cpu.sh (100%) rename {bookworm/home_files => archived/__many_releases/home}/root/.shell_prompt_color (100%) rename {many_releases => archived/__many_releases}/scripts/_misc.sh (100%) delete mode 100644 archived/all_new_2018/apt-mark/all delete mode 100644 archived/all_new_2018/apt-mark/server delete mode 100755 archived/all_new_2018/borg.sh delete mode 100644 archived/all_new_2018/linkable_etc_files/all/etc/apt/sources.list delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/aliases delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-auth.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-lmtp.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-mail.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-master.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-ssl.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/iptables/rules.v4 delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/opendkim.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/postfix/main.cf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/postfix/master.cf delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/fetchmail.service delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/pingmail.service delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/fetchmail.timer delete mode 100644 archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/pingmail.timer delete mode 100644 archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/encrypt_chatlogs.service delete mode 100644 archived/all_new_2018/linkable_etc_files/sendonly/etc/aliases delete mode 100644 archived/all_new_2018/linkable_etc_files/sendonly/etc/postfix/main.cf delete mode 100644 archived/all_new_2018/linkable_etc_files/server/etc/iptables/rules.v4 delete mode 100644 archived/all_new_2018/linkable_etc_files/server/etc/ssh/sshd_config delete mode 100644 archived/all_new_2018/linkable_etc_files/web/etc/cron.d/certbot delete mode 100644 archived/all_new_2018/linkable_etc_files/web/etc/gitweb.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/web/etc/iptables/rules.v4 delete mode 100644 archived/all_new_2018/linkable_etc_files/web/etc/nginx/nginx.conf delete mode 100644 archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/certbot.service delete mode 100755 archived/all_new_2018/setup_scripts/add_encryption_key.sh delete mode 100755 archived/all_new_2018/setup_scripts/hardlink_etc.sh delete mode 100755 archived/all_new_2018/setup_scripts/init_user_and_keybased_login.sh delete mode 100755 archived/all_new_2018/setup_scripts/install_for_target.sh delete mode 100755 archived/all_new_2018/setup_scripts/letsencrypt.sh delete mode 100755 archived/all_new_2018/setup_scripts/letsencrypt_get.sh delete mode 100755 archived/all_new_2018/setup_scripts/prepare_to_meet_server.sh delete mode 100755 archived/all_new_2018/setup_scripts/purge_nonrequireds.sh delete mode 100755 archived/all_new_2018/setup_scripts/set_hostname_and_fqdn.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_mail.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_play.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_plomlombot.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_sendonly.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_server.sh delete mode 100755 archived/all_new_2018/setup_scripts/setup_web.sh delete mode 100644 archived/all_new_2018/user_files/dovecot.sieve delete mode 100755 archived/all_new_2018/user_files/encrypter.sh delete mode 100755 archived/all_new_2018/user_files/fetchmailrc delete mode 100644 archived/all_new_2018/user_files/pingmailrc delete mode 100755 archived/all_new_2018/user_files/plomlombot_daemon.sh delete mode 100755 archived/all_new_2018/user_files/weechat-wrapper.sh delete mode 100644 archived/all_new_2018/user_files/weechatrc delete mode 100644 archived/ansible/config.yml delete mode 100644 archived/ansible/config_new.yml delete mode 100644 archived/ansible/files/apt-mark/3d_acceleration delete mode 100644 archived/ansible/files/apt-mark/basic_x_tools delete mode 100644 archived/ansible/files/apt-mark/browser_environment delete mode 100644 archived/ansible/files/apt-mark/console delete mode 100644 archived/ansible/files/apt-mark/core delete mode 100644 archived/ansible/files/apt-mark/hotkeys delete mode 100644 archived/ansible/files/apt-mark/man delete mode 100644 archived/ansible/files/apt-mark/minimal_ansible_environment delete mode 100644 archived/ansible/files/apt-mark/minimal_x delete mode 100644 archived/ansible/files/apt-mark/multimedia delete mode 100644 archived/ansible/files/apt-mark/power_management delete mode 100644 archived/ansible/files/apt-mark/various_useful delete mode 100644 archived/ansible/files/apt-mark/wifi delete mode 100644 archived/ansible/files/apt-mark_new/W530/3d_acceleration delete mode 100644 archived/ansible/files/apt-mark_new/W530/browser_environment delete mode 100644 archived/ansible/files/apt-mark_new/W530/hotkeys delete mode 100644 archived/ansible/files/apt-mark_new/W530/multimedia delete mode 100644 archived/ansible/files/apt-mark_new/W530/wicd delete mode 100644 archived/ansible/files/apt-mark_new/X200s/multimedia delete mode 100644 archived/ansible/files/apt-mark_new/X200s/power_management delete mode 100644 archived/ansible/files/apt-mark_new/X200s/wifi delete mode 100644 archived/ansible/files/apt-mark_new/minimal/3d_acceleration delete mode 100644 archived/ansible/files/apt-mark_new/minimal/basic_x_tools delete mode 100644 archived/ansible/files/apt-mark_new/minimal/browser_environment delete mode 100644 archived/ansible/files/apt-mark_new/minimal/console delete mode 100644 archived/ansible/files/apt-mark_new/minimal/core delete mode 100644 archived/ansible/files/apt-mark_new/minimal/disk_encryption delete mode 100644 archived/ansible/files/apt-mark_new/minimal/man delete mode 100644 archived/ansible/files/apt-mark_new/minimal/minimal_ansible_environment delete mode 100644 archived/ansible/files/apt-mark_new/minimal/minimal_x delete mode 100644 archived/ansible/files/apt-mark_new/minimal/multimedia delete mode 100644 archived/ansible/files/apt-mark_new/minimal/power_management delete mode 100644 archived/ansible/files/apt-mark_new/minimal/various_useful delete mode 100644 archived/ansible/files/apt-mark_new/minimal/wifi delete mode 100644 archived/ansible/files/console/___etc___default___console-setup delete mode 100644 archived/ansible/files/console/___etc___default___keyboard delete mode 100644 archived/ansible/files/dirs delete mode 100644 archived/ansible/files/dirs_new delete mode 100644 archived/ansible/files/system/___etc___X11___xorg.conf.forced_nvidia delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-brightness-down delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-brightness-up delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-micmute delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-mute delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-volume-down delete mode 100644 archived/ansible/files/system/___etc___acpi___events___plom-volume-up delete mode 100644 archived/ansible/files/system/___etc___apt___apt.conf.d___99mindeps delete mode 100644 archived/ansible/files/system/___etc___apt___sources.list delete mode 100644 archived/ansible/files/system/___etc___default___tlp delete mode 100644 archived/ansible/files/system/___etc___hostname delete mode 100644 archived/ansible/files/system/___etc___hosts delete mode 100644 archived/ansible/files/system/___etc___profile delete mode 100644 archived/ansible/files/system/___etc___systemd___logind.conf delete mode 100644 archived/ansible/files/system/___etc___timezone delete mode 100644 archived/ansible/files/system/___etc___wicd___manager-settings.conf delete mode 100644 archived/ansible/files/system_new/W530/___etc___X11___xorg.conf.forced_nvidia delete mode 100644 archived/ansible/files/system_new/W530/___etc___hostname delete mode 100644 archived/ansible/files/system_new/W530/___etc___hosts delete mode 100644 archived/ansible/files/system_new/W530/___etc___wicd___manager-settings.conf delete mode 100644 archived/ansible/files/system_new/X200s/___etc___hostname delete mode 100644 archived/ansible/files/system_new/X200s/___etc___hosts delete mode 100644 archived/ansible/files/system_new/minimal/___etc___apt___apt.conf.d___99mindeps delete mode 100644 archived/ansible/files/system_new/minimal/___etc___apt___sources.list delete mode 100644 archived/ansible/files/system_new/minimal/___etc___apt___sources.list.d___palemoon.list delete mode 100644 archived/ansible/files/system_new/minimal/___etc___default___tlp delete mode 100644 archived/ansible/files/system_new/minimal/___etc___profile delete mode 100644 archived/ansible/files/system_new/minimal/___etc___systemd___logind.conf delete mode 100644 archived/ansible/files/system_new/minimal/___etc___timezone delete mode 100755 archived/ansible/run_root.sh delete mode 100755 archived/ansible/run_root_new.sh delete mode 100755 archived/ansible/run_user.sh delete mode 100755 archived/ansible/run_user_new.sh delete mode 100644 archived/ansible/tasks/initial_purge.yml delete mode 100644 archived/ansible/tasks/qutebrowser.yml delete mode 100644 archived/ansible/user.yml delete mode 100644 archived/ansible/user_new.yml delete mode 100755 archived/archive_plomroma.py delete mode 100755 archived/bin/broiler_in.sh delete mode 100755 archived/bin/hubbabubba.sh delete mode 100755 archived/bin/i3status_wrapper.py delete mode 100755 archived/bin/install_certs.sh delete mode 100755 archived/bin/network.sh delete mode 100755 archived/bin/plomlombot.sh delete mode 100755 archived/bin/renew_certs.sh delete mode 100755 archived/bin/setup_opendkim.sh delete mode 100755 archived/bin/setup_starttls.sh delete mode 100755 archived/bin/simplemail.sh delete mode 100755 archived/bin/simplemail_out.sh delete mode 100755 archived/bin/start_htwtxt.sh delete mode 100755 archived/bin/symlink.sh delete mode 100755 archived/bin/w530_backlight.sh delete mode 100755 archived/bin/w530_startx_force_nvidia.sh delete mode 100755 archived/bin/weechat-wrapper.sh delete mode 100755 archived/bin/wicd-wrapper.sh delete mode 100755 archived/bin/zinskritik.sh rename archived/{buster => bullseye}/apt-mark/all (100%) rename archived/{buster => bullseye}/apt-mark/desktop (100%) rename archived/{buster => bullseye}/apt-mark/dumpsite (100%) rename {bullseye => archived/bullseye}/apt-mark/microblogpub (100%) rename archived/{buster => bullseye}/apt-mark/play (100%) rename archived/{buster => bullseye}/apt-mark/server (100%) rename archived/{buster => bullseye}/apt-mark/thinkpad (100%) rename {bullseye => archived/bullseye}/apt-mark/user (100%) rename archived/{buster => bullseye}/apt-mark/w530 (100%) rename {bookworm => archived/bullseye}/apt-mark/web (100%) rename {bullseye => archived/bullseye}/apt-mark/website (100%) rename {bullseye => archived/bullseye}/borg.sh (100%) rename {bookworm => archived/bullseye}/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies (100%) rename {bullseye => archived/bullseye}/etc_files/all/etc/apt/sources.list (100%) rename {bookworm => archived/bullseye}/etc_files/all/etc/default/locale (100%) rename {bookworm => archived/bullseye}/etc_files/all/etc/locale.gen (100%) rename {bookworm => archived/bullseye}/etc_files/all/etc/timezone (100%) rename {bullseye => archived/bullseye}/etc_files/daily_reboot/etc/systemd/system/reboot.service (100%) rename {bullseye => archived/bullseye}/etc_files/daily_reboot/etc/systemd/system/reboot.timer (100%) rename {bullseye => archived/bullseye}/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx (100%) rename archived/{buster => bullseye}/etc_files/dumpsite/etc/systemd/system/url_catcher.service (100%) rename {bullseye => archived/bullseye}/etc_files/microblogpub/etc/apt/sources.list (100%) rename {bullseye => archived/bullseye}/etc_files/microblogpub/etc/nginx/sites-available/microblogpub.nginx (100%) rename {bullseye => archived/bullseye}/etc_files/microblogpub/etc/systemd/system/microblogpub.service (100%) rename {bullseye => archived/bullseye}/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.service (100%) rename {bullseye => archived/bullseye}/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.timer (100%) rename archived/{buster => bullseye}/etc_files/play/etc/systemd/system/encrypt_chatlogs.service (100%) rename archived/{all_new_2018/linkable_etc_files/play/etc/systemd/system/timers.target.wants => bullseye/etc_files/play/etc/systemd/system}/encrypt_chatlogs.timer (100%) rename {bullseye => archived/bullseye}/etc_files/server/etc/ssh/sshd_config (100%) rename archived/{buster => bullseye}/etc_files/thinkpad/etc/default/tlp (100%) rename {bullseye => archived/bullseye}/etc_files/thinkpad/etc/network/interfaces (100%) rename archived/{buster => bullseye}/etc_files/thinkpad/etc/systemd/logind.conf (100%) rename {bookworm => archived/bullseye}/etc_files/web/etc/nftables.conf (100%) rename {bookworm => archived/bullseye}/etc_files/web/etc/nginx/nginx.conf (100%) rename archived/{buster => bullseye}/etc_files/website/etc/gitweb.conf (100%) rename {bullseye => archived/bullseye}/etc_files/website/etc/nginx/sites-available/website.nginx (100%) rename archived/{all_new_2018/linkable_etc_files/web => bullseye/etc_files/website}/etc/systemd/system/plomlombot.service (100%) rename {bullseye => archived/bullseye}/home_files/minimal/.bashrc (100%) rename {bullseye => archived/bullseye}/home_files/root/.shell_prompt_color (100%) rename {bookworm => archived/bullseye}/home_files/user/.Xresources (100%) rename {bookworm => archived/bullseye}/home_files/user/.borgrepos (100%) rename {bullseye => archived/bullseye}/home_files/user/.config/i3/config (100%) rename {bullseye => archived/bullseye}/home_files/user/.emacs.d/init.el (100%) rename {bullseye => archived/bullseye}/home_files/user/.gitconfig (100%) rename archived/{buster => bullseye}/home_files/user/.mbsyncrc (100%) rename {bookworm => archived/bullseye}/home_files/user/.notmuch-config (100%) rename {bookworm => archived/bullseye}/home_files/user/.shell_prompt_color (100%) rename archived/{buster => bullseye}/home_files/user/.tridactylrc (100%) rename archived/{buster => bullseye}/home_files/user/.xinitrc (100%) rename archived/{buster => bullseye}/home_files/user/mail_sync.sh (100%) rename archived/{buster => bullseye}/home_files/user/public_repos/repos (100%) rename archived/{buster/home_files/x220 => bullseye/home_files/w530}/.config/i3status/config (100%) rename {bullseye => archived/bullseye}/home_files/x220/.config/i3status/config (100%) rename archived/{buster/etc_files/user/opt/firefox => bullseye/other_files}/blank.html (100%) rename archived/{buster => bullseye}/other_files/blog_hook_post-receive (100%) rename archived/{buster => bullseye}/other_files/dumpsite_index.html (100%) rename {bullseye => archived/bullseye}/other_files/plomlombot_daemon.sh (100%) rename archived/{buster => bullseye}/other_files/plomlombot_hook_post-receive (100%) rename {bullseye => archived/bullseye}/other_files/prune_microblogpub.sh (100%) rename archived/{buster => bullseye}/other_files/url-catcher_customizations.json (100%) rename archived/{buster => bullseye}/other_files/website_hook_post-receive (100%) rename archived/{buster => bullseye}/other_files/weechat-wrapper.sh (100%) rename archived/{buster => bullseye}/other_files/weechatlogs_encrypter.sh (100%) rename {bullseye => archived/bullseye}/other_files/weechatrc (100%) rename archived/{buster => bullseye}/other_files/zettel_hook_post-receive (100%) rename archived/{buster => bullseye}/setup_scripts/copy_dirtree.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/init_user_and_keybased_login.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/init_user_login.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/install_for_target.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/migrate_borg.sh (100%) rename archived/{all_new_2018 => bullseye}/setup_scripts/mirror_dir.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/misc.sh (100%) rename archived/{buster => bullseye}/setup_scripts/prepare_to_meet_server.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/purge_nonrequireds.sh (100%) rename archived/{buster => bullseye}/setup_scripts/set_hostname_and_fqdn.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_daily_reboot.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_desktop.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_dumpsite.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_firefox.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_home.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_microblogpub.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_play.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_server.sh (100%) rename {bullseye => archived/bullseye}/setup_scripts/setup_website.sh (100%) delete mode 100644 archived/buster/apt-mark/eeepc delete mode 100644 archived/buster/apt-mark/mail delete mode 100644 archived/buster/apt-mark/old_server delete mode 100644 archived/buster/apt-mark/peertube delete mode 100644 archived/buster/apt-mark/pleroma delete mode 100644 archived/buster/apt-mark/pleroma_otp delete mode 100644 archived/buster/apt-mark/pleroma_source delete mode 100644 archived/buster/apt-mark/seedbox delete mode 100644 archived/buster/apt-mark/user delete mode 100644 archived/buster/apt-mark/website delete mode 100644 archived/buster/apt-mark/x200s delete mode 100644 archived/buster/etc_files/all/etc/apt/sources.list delete mode 100644 archived/buster/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx delete mode 100644 archived/buster/etc_files/eeepc/etc/systemd/logind.conf delete mode 100644 archived/buster/etc_files/mail/etc/aliases delete mode 100644 archived/buster/etc_files/mail/etc/dovecot/conf.d/99-lmtp-sieve-filtering.conf delete mode 100644 archived/buster/etc_files/mail/etc/dovecot/conf.d/99-smtp-sasl.conf delete mode 100644 archived/buster/etc_files/mail/etc/mailutils.conf delete mode 100755 archived/buster/etc_files/mail/etc/nftables.conf delete mode 100644 archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.service delete mode 100644 archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.timer delete mode 100644 archived/buster/etc_files/mail/etc/systemd/system/pingmail.service delete mode 100644 archived/buster/etc_files/mail/etc/systemd/system/pingmail.timer delete mode 100644 archived/buster/etc_files/old_server/etc/apt/sources.list delete mode 100644 archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer delete mode 100644 archived/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html delete mode 100644 archived/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt delete mode 100644 archived/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html delete mode 100755 archived/buster/etc_files/server/etc/nftables.conf delete mode 100644 archived/buster/etc_files/server/etc/ssh/sshd_config delete mode 100644 archived/buster/etc_files/user/etc/cups/printers.conf delete mode 100644 archived/buster/etc_files/user/etc/default/console-setup delete mode 100644 archived/buster/etc_files/user/opt/firefox/defaults/pref/autoconfig.js delete mode 100644 archived/buster/etc_files/user/opt/firefox/firefox.cfg delete mode 100644 archived/buster/etc_files/user/usr/share/applications/firefox.desktop delete mode 100644 archived/buster/etc_files/website/etc/nginx/sites-available/website.nginx delete mode 100644 archived/buster/etc_files/website/etc/systemd/system/plomlombot.service delete mode 100644 archived/buster/etc_files/x200s/etc/wicd/manager-settings.conf delete mode 100644 archived/buster/etc_files/x220/etc/wicd/manager-settings.conf delete mode 100644 archived/buster/home_files/eeepc/.config/i3status/config delete mode 100644 archived/buster/home_files/minimal/.bashrc delete mode 100644 archived/buster/home_files/user/.config/i3/config delete mode 100644 archived/buster/home_files/user/.emacs.d/init.el delete mode 100644 archived/buster/home_files/x200s/.config/i3status/config delete mode 100644 archived/buster/other_files/append_opendkim.conf delete mode 100644 archived/buster/other_files/append_pleroma_config delete mode 100644 archived/buster/other_files/append_postfix_main.cf delete mode 100644 archived/buster/other_files/append_postfix_master.cf delete mode 100644 archived/buster/other_files/dovecot.sieve delete mode 100755 archived/buster/other_files/fetchmailrc delete mode 100644 archived/buster/other_files/peertube_production.yaml delete mode 100644 archived/buster/other_files/pingmailrc delete mode 100644 archived/buster/other_files/pixel.png delete mode 100644 archived/buster/other_files/pleroma_panel.html delete mode 100644 archived/buster/other_files/pleroma_robots.txt delete mode 100644 archived/buster/other_files/pleroma_terms-of-service.html delete mode 100755 archived/buster/other_files/plomlombot_daemon.sh delete mode 100644 archived/buster/other_files/weechatrc delete mode 100755 archived/buster/setup_scripts/backup_app.sh delete mode 100755 archived/buster/setup_scripts/init_user_and_keybased_login.sh delete mode 100755 archived/buster/setup_scripts/init_user_login.sh delete mode 100755 archived/buster/setup_scripts/install_for_target.sh delete mode 100755 archived/buster/setup_scripts/migrate_app.sh delete mode 100755 archived/buster/setup_scripts/migrate_borg.sh delete mode 100755 archived/buster/setup_scripts/mirror_dir.sh delete mode 100755 archived/buster/setup_scripts/purge_nonrequireds.sh delete mode 100755 archived/buster/setup_scripts/restore_app.sh delete mode 100755 archived/buster/setup_scripts/setup.sh delete mode 100755 archived/buster/setup_scripts/setup_desktop.sh delete mode 100755 archived/buster/setup_scripts/setup_dumpsite.sh delete mode 100755 archived/buster/setup_scripts/setup_home.sh delete mode 100755 archived/buster/setup_scripts/setup_mail.sh delete mode 100755 archived/buster/setup_scripts/setup_peertube.sh delete mode 100755 archived/buster/setup_scripts/setup_play.sh delete mode 100755 archived/buster/setup_scripts/setup_pleroma_otp.sh delete mode 100755 archived/buster/setup_scripts/setup_pleroma_source.sh delete mode 100755 archived/buster/setup_scripts/setup_seedbox.sh delete mode 100755 archived/buster/setup_scripts/setup_server.sh delete mode 100755 archived/buster/setup_scripts/setup_website.sh delete mode 100755 archived/buster/setup_scripts/update_pleroma_source.sh delete mode 100755 archived/buster/setup_scripts/upgrade_peertube.sh delete mode 100644 archived/dotfiles/minimal/bashrc delete mode 100644 archived/dotfiles/minimal/gitconfig delete mode 100644 archived/dotfiles/minimal/profile delete mode 100644 archived/dotfiles/minimal/shinit delete mode 100644 archived/dotfiles/minimal/vimrc delete mode 100644 archived/dotfiles/root/shinit_color delete mode 100644 archived/dotfiles/root/vimrc_add delete mode 100644 archived/dotfiles/user/server/minimal/mailfilter delete mode 100644 archived/dotfiles/user/server/minimal/muttrc delete mode 100644 archived/dotfiles/user/server/minimal/vimrc_add delete mode 100644 archived/dotfiles/user/server/personal/minimal/getmail/getmailrc delete mode 100644 archived/dotfiles/user/server/personal/minimal/procmailrc delete mode 100644 archived/dotfiles/user/server/personal/minimal/shinit_add delete mode 100644 archived/dotfiles/user/server/personal/minimal/weechatrc delete mode 100644 archived/dotfiles/user/server/personal/plomlompom.com/shinit_color delete mode 100644 archived/dotfiles/user/server/personal/test.plomlompom.com/shinit_color delete mode 100644 archived/dotfiles/user/server/public/shinit_add delete mode 100644 archived/dotfiles/user/server/public/shinit_color delete mode 100644 archived/dotfiles/user/thinkpad/W530/Xresources-local delete mode 100644 archived/dotfiles/user/thinkpad/W530/i3status.conf delete mode 100644 archived/dotfiles/user/thinkpad/X200s/Xresources-local delete mode 100644 archived/dotfiles/user/thinkpad/X200s/i3status.conf delete mode 100644 archived/dotfiles/user/thinkpad/minimal/Xresources delete mode 100644 archived/dotfiles/user/thinkpad/minimal/i3 delete mode 100644 archived/dotfiles/user/thinkpad/minimal/pentadactylrc delete mode 100644 archived/dotfiles/user/thinkpad/minimal/shinit_color delete mode 100644 archived/dotfiles/user/thinkpad/minimal/vimrc_add delete mode 100644 archived/dotfiles/user/thinkpad/minimal/xinitrc delete mode 100755 archived/jessie_postinstall.sh delete mode 100644 archived/mails/htwtxt_restart delete mode 100644 archived/mails/server_postinstall_finished delete mode 100644 archived/mails/update_reminder delete mode 100644 archived/mails/weechat_restart_reminder rename misc.sh => archived/misc.sh (100%) delete mode 100644 archived/notes delete mode 100644 archived/raspbian/.alsoftrc delete mode 100644 archived/raspbian/.asoundrc delete mode 100644 archived/raspbian/.bash_aliases delete mode 100755 archived/setup_go.sh delete mode 100644 archived/stretch/apt-mark/seedbox delete mode 100644 archived/stretch/etc_files/server/etc/ssh/sshd_config delete mode 100755 archived/stretch/setup_scripts/init_user_and_keybased_login.sh delete mode 100755 archived/stretch/setup_scripts/install_for_target.sh delete mode 100755 archived/stretch/setup_scripts/setup_seedbox.sh delete mode 100644 archived/systemfiles/aliases delete mode 100644 archived/systemfiles/htwtxt_restart_reminder.service delete mode 100644 archived/systemfiles/main.cf delete mode 100644 archived/systemfiles/nginx.conf delete mode 100644 archived/systemfiles/opendkim.conf delete mode 100644 archived/systemfiles/plomlombot.service delete mode 100755 archived/systemfiles/post-update delete mode 100644 archived/systemfiles/weechat.service rename {testing => archived/testing}/apt-mark/all (100%) rename {testing => archived/testing}/apt-mark/h610m (100%) rename {testing => archived/testing}/apt-mark/t490s (100%) rename {testing => archived/testing}/apt-mark/user (100%) rename {testing => archived/testing}/aptmark/h610m (100%) rename {testing => archived/testing}/aptmark/server (100%) rename {bullseye => archived/testing}/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies (100%) rename {testing => archived/testing}/etc_files/all/etc/apt/sources.list (100%) rename {bullseye => archived/testing}/etc_files/all/etc/default/locale (100%) rename {bullseye => archived/testing}/etc_files/all/etc/locale.gen (100%) rename {bullseye => archived/testing}/etc_files/all/etc/timezone (100%) rename {testing => archived/testing}/home_files/h610m/.xinitrc_bonus (100%) rename {testing => archived/testing}/home_files/minimal/.bashrc (100%) rename {many_releases/home => archived/testing/home_files}/root/.shell_prompt_color (100%) rename {bullseye => archived/testing}/home_files/user/.Xresources (100%) rename {bullseye => archived/testing}/home_files/user/.borgrepos (100%) rename {testing => archived/testing}/home_files/user/.config/i3/config (100%) rename {bookworm => archived/testing}/home_files/user/.config/i3status/config (100%) rename {testing => archived/testing}/home_files/user/.emacs.d/init.el (100%) rename {many_releases/home/all => archived/testing/home_files/user}/.gitconfig (100%) rename {testing => archived/testing}/home_files/user/.mbsyncrc (100%) rename {bullseye => archived/testing}/home_files/user/.notmuch-config (100%) rename {bullseye => archived/testing}/home_files/user/.shell_prompt_color (100%) rename {testing => archived/testing}/home_files/user/.tridactylrc (100%) rename {testing => archived/testing}/home_files/user/.xinitrc (100%) rename {testing => archived/testing}/home_files/user/mail_sync.sh (100%) rename {testing => archived/testing}/home_files/user/public_repos/repos (100%) rename testing/scripts/setup_raspi.sh => archived/testing/scripts/__setup_raspi.sh (100%) rename {testing => archived/testing}/setup_scripts/_setup.sh (100%) rename {testing => archived/testing}/setup_scripts/copy_dirtree.sh (100%) rename {testing => archived/testing}/setup_scripts/install_for_target.sh (100%) rename {testing => archived/testing}/setup_scripts/misc.sh (100%) rename {testing => archived/testing}/setup_scripts/purge_nonrequireds.sh (100%) rename {testing => archived/testing}/setup_scripts/set_hostname_and_fqdn.sh (100%) rename {testing => archived/testing}/setup_scripts/setup_desktop.sh (100%) rename {testing => archived/testing}/setup_scripts/setup_home.sh (100%) delete mode 100755 archived/update_key.sh delete mode 100644 bullseye/apt-mark/all delete mode 100644 bullseye/apt-mark/desktop delete mode 100644 bullseye/apt-mark/dumpsite delete mode 100644 bullseye/apt-mark/play delete mode 100644 bullseye/apt-mark/server delete mode 100644 bullseye/apt-mark/thinkpad delete mode 100644 bullseye/apt-mark/w530 delete mode 100644 bullseye/apt-mark/web delete mode 100644 bullseye/etc_files/dumpsite/etc/systemd/system/url_catcher.service delete mode 100644 bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.service delete mode 100644 bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer delete mode 100644 bullseye/etc_files/thinkpad/etc/default/tlp delete mode 100644 bullseye/etc_files/thinkpad/etc/systemd/logind.conf delete mode 100755 bullseye/etc_files/web/etc/nftables.conf delete mode 100644 bullseye/etc_files/web/etc/nginx/nginx.conf delete mode 100644 bullseye/etc_files/website/etc/gitweb.conf delete mode 100644 bullseye/etc_files/website/etc/systemd/system/plomlombot.service delete mode 100644 bullseye/home_files/user/.mbsyncrc delete mode 100644 bullseye/home_files/user/.tridactylrc delete mode 100644 bullseye/home_files/user/.xinitrc delete mode 100755 bullseye/home_files/user/mail_sync.sh delete mode 100644 bullseye/home_files/user/public_repos/repos delete mode 100644 bullseye/home_files/w530/.config/i3status/config delete mode 100644 bullseye/other_files/blank.html delete mode 100755 bullseye/other_files/blog_hook_post-receive delete mode 100644 bullseye/other_files/dumpsite_index.html delete mode 100755 bullseye/other_files/plomlombot_hook_post-receive delete mode 100644 bullseye/other_files/url-catcher_customizations.json delete mode 100755 bullseye/other_files/website_hook_post-receive delete mode 100755 bullseye/other_files/weechat-wrapper.sh delete mode 100755 bullseye/other_files/weechatlogs_encrypter.sh delete mode 100755 bullseye/other_files/zettel_hook_post-receive delete mode 100755 bullseye/setup_scripts/copy_dirtree.sh delete mode 100755 bullseye/setup_scripts/mirror_dir.sh delete mode 100755 bullseye/setup_scripts/prepare_to_meet_server.sh delete mode 100755 bullseye/setup_scripts/set_hostname_and_fqdn.sh rename {many_releases => testing}/etc/all/apt/apt.conf.d/99_minimize_dependencies (100%) rename testing/{etc_files/all/etc/default/locale => etc/all/locale.conf} (100%) rename {many_releases => testing}/etc/all/locale.gen (100%) rename {many_releases => testing}/etc/all/timezone (100%) rename testing/etc/{t490s => desktop}/network/interfaces (100%) delete mode 100644 testing/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies delete mode 100644 testing/etc_files/all/etc/locale.gen delete mode 100644 testing/etc_files/all/etc/timezone rename testing/{home_files => home}/root/.shell_prompt_color (100%) rename testing/{home_files => home}/user/.gitconfig (100%) rename testing/{home_files => home}/user/.shell_prompt_color (100%) delete mode 100644 testing/home_files/user/.Xresources delete mode 100644 testing/home_files/user/.borgrepos delete mode 100644 testing/home_files/user/.config/i3status/config delete mode 100644 testing/home_files/user/.notmuch-config create mode 100644 testing/scripts/_config_scripts_lib.sh delete mode 100644 testing/scripts/_misc.sh diff --git a/bookworm/apt-mark/all b/_bookworm/apt-mark/all similarity index 100% rename from bookworm/apt-mark/all rename to _bookworm/apt-mark/all diff --git a/bookworm/apt-mark/h610m b/_bookworm/apt-mark/h610m similarity index 100% rename from bookworm/apt-mark/h610m rename to _bookworm/apt-mark/h610m diff --git a/bookworm/apt-mark/seedbox b/_bookworm/apt-mark/seedbox similarity index 100% rename from bookworm/apt-mark/seedbox rename to _bookworm/apt-mark/seedbox diff --git a/bookworm/apt-mark/server b/_bookworm/apt-mark/server similarity index 100% rename from bookworm/apt-mark/server rename to _bookworm/apt-mark/server diff --git a/bookworm/apt-mark/thinkpad b/_bookworm/apt-mark/thinkpad similarity index 100% rename from bookworm/apt-mark/thinkpad rename to _bookworm/apt-mark/thinkpad diff --git a/bookworm/apt-mark/user b/_bookworm/apt-mark/user similarity index 100% rename from bookworm/apt-mark/user rename to _bookworm/apt-mark/user diff --git a/bookworm/apt-mark/w530 b/_bookworm/apt-mark/w530 similarity index 100% rename from bookworm/apt-mark/w530 rename to _bookworm/apt-mark/w530 diff --git a/archived/buster/apt-mark/web b/_bookworm/apt-mark/web similarity index 100% rename from archived/buster/apt-mark/web rename to _bookworm/apt-mark/web diff --git a/bookworm/borg.sh b/_bookworm/borg.sh similarity index 100% rename from bookworm/borg.sh rename to _bookworm/borg.sh diff --git a/archived/all_new_2018/linkable_etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies b/_bookworm/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies similarity index 100% rename from archived/all_new_2018/linkable_etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies rename to _bookworm/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies diff --git a/bookworm/etc_files/all/etc/apt/sources.list b/_bookworm/etc_files/all/etc/apt/sources.list similarity index 100% rename from bookworm/etc_files/all/etc/apt/sources.list rename to _bookworm/etc_files/all/etc/apt/sources.list diff --git a/archived/buster/etc_files/all/etc/default/locale b/_bookworm/etc_files/all/etc/default/locale similarity index 100% rename from archived/buster/etc_files/all/etc/default/locale rename to _bookworm/etc_files/all/etc/default/locale diff --git a/archived/all_new_2018/linkable_etc_files/all/etc/locale.gen b/_bookworm/etc_files/all/etc/locale.gen similarity index 100% rename from archived/all_new_2018/linkable_etc_files/all/etc/locale.gen rename to _bookworm/etc_files/all/etc/locale.gen diff --git a/archived/all_new_2018/linkable_etc_files/all/etc/timezone b/_bookworm/etc_files/all/etc/timezone similarity index 100% rename from archived/all_new_2018/linkable_etc_files/all/etc/timezone rename to _bookworm/etc_files/all/etc/timezone diff --git a/bookworm/etc_files/seedbox/etc/systemd/system/rtorrent.service b/_bookworm/etc_files/seedbox/etc/systemd/system/rtorrent.service similarity index 100% rename from bookworm/etc_files/seedbox/etc/systemd/system/rtorrent.service rename to _bookworm/etc_files/seedbox/etc/systemd/system/rtorrent.service diff --git a/bookworm/etc_files/server/etc/ssh/sshd_config b/_bookworm/etc_files/server/etc/ssh/sshd_config similarity index 100% rename from bookworm/etc_files/server/etc/ssh/sshd_config rename to _bookworm/etc_files/server/etc/ssh/sshd_config diff --git a/bookworm/etc_files/status.plomlompom.com/etc/nginx/sites-available/status.plomlompom.com.nginx b/_bookworm/etc_files/status.plomlompom.com/etc/nginx/sites-available/status.plomlompom.com.nginx similarity index 100% rename from bookworm/etc_files/status.plomlompom.com/etc/nginx/sites-available/status.plomlompom.com.nginx rename to _bookworm/etc_files/status.plomlompom.com/etc/nginx/sites-available/status.plomlompom.com.nginx diff --git a/bookworm/etc_files/tube.plomlompom.com/etc/nginx/sites-available/tube.plomlompom.com.nginx b/_bookworm/etc_files/tube.plomlompom.com/etc/nginx/sites-available/tube.plomlompom.com.nginx similarity index 100% rename from bookworm/etc_files/tube.plomlompom.com/etc/nginx/sites-available/tube.plomlompom.com.nginx rename to _bookworm/etc_files/tube.plomlompom.com/etc/nginx/sites-available/tube.plomlompom.com.nginx diff --git a/bookworm/etc_files/w530/etc/default/grub b/_bookworm/etc_files/w530/etc/default/grub similarity index 100% rename from bookworm/etc_files/w530/etc/default/grub rename to _bookworm/etc_files/w530/etc/default/grub diff --git a/bookworm/etc_files/w530/etc/modprobe.d/blacklist-nouveau.conf b/_bookworm/etc_files/w530/etc/modprobe.d/blacklist-nouveau.conf similarity index 100% rename from bookworm/etc_files/w530/etc/modprobe.d/blacklist-nouveau.conf rename to _bookworm/etc_files/w530/etc/modprobe.d/blacklist-nouveau.conf diff --git a/archived/buster/etc_files/web/etc/nftables.conf b/_bookworm/etc_files/web/etc/nftables.conf similarity index 100% rename from archived/buster/etc_files/web/etc/nftables.conf rename to _bookworm/etc_files/web/etc/nftables.conf diff --git a/archived/buster/etc_files/web/etc/nginx/nginx.conf b/_bookworm/etc_files/web/etc/nginx/nginx.conf similarity index 100% rename from archived/buster/etc_files/web/etc/nginx/nginx.conf rename to _bookworm/etc_files/web/etc/nginx/nginx.conf diff --git a/bookworm/home_files/h610m/.xinitrc_bonus b/_bookworm/home_files/h610m/.xinitrc_bonus similarity index 100% rename from bookworm/home_files/h610m/.xinitrc_bonus rename to _bookworm/home_files/h610m/.xinitrc_bonus diff --git a/bookworm/home_files/minimal/.bashrc b/_bookworm/home_files/minimal/.bashrc similarity index 100% rename from bookworm/home_files/minimal/.bashrc rename to _bookworm/home_files/minimal/.bashrc diff --git a/archived/buster/home_files/root/.shell_prompt_color b/_bookworm/home_files/root/.shell_prompt_color similarity index 100% rename from archived/buster/home_files/root/.shell_prompt_color rename to _bookworm/home_files/root/.shell_prompt_color diff --git a/bookworm/home_files/seedbox/.rtorrent.rc b/_bookworm/home_files/seedbox/.rtorrent.rc similarity index 100% rename from bookworm/home_files/seedbox/.rtorrent.rc rename to _bookworm/home_files/seedbox/.rtorrent.rc diff --git a/archived/buster/home_files/user/.Xresources b/_bookworm/home_files/user/.Xresources similarity index 100% rename from archived/buster/home_files/user/.Xresources rename to _bookworm/home_files/user/.Xresources diff --git a/archived/buster/home_files/user/.borgrepos b/_bookworm/home_files/user/.borgrepos similarity index 100% rename from archived/buster/home_files/user/.borgrepos rename to _bookworm/home_files/user/.borgrepos diff --git a/bookworm/home_files/user/.config/i3/config b/_bookworm/home_files/user/.config/i3/config similarity index 100% rename from bookworm/home_files/user/.config/i3/config rename to _bookworm/home_files/user/.config/i3/config diff --git a/archived/buster/home_files/w530/.config/i3status/config b/_bookworm/home_files/user/.config/i3status/config similarity index 100% rename from archived/buster/home_files/w530/.config/i3status/config rename to _bookworm/home_files/user/.config/i3status/config diff --git a/bookworm/home_files/user/.emacs.d/init.el b/_bookworm/home_files/user/.emacs.d/init.el similarity index 100% rename from bookworm/home_files/user/.emacs.d/init.el rename to _bookworm/home_files/user/.emacs.d/init.el diff --git a/archived/buster/home_files/user/.gitconfig b/_bookworm/home_files/user/.gitconfig similarity index 100% rename from archived/buster/home_files/user/.gitconfig rename to _bookworm/home_files/user/.gitconfig diff --git a/bookworm/home_files/user/.mbsyncrc b/_bookworm/home_files/user/.mbsyncrc similarity index 100% rename from bookworm/home_files/user/.mbsyncrc rename to _bookworm/home_files/user/.mbsyncrc diff --git a/archived/buster/home_files/user/.notmuch-config b/_bookworm/home_files/user/.notmuch-config similarity index 100% rename from archived/buster/home_files/user/.notmuch-config rename to _bookworm/home_files/user/.notmuch-config diff --git a/archived/buster/home_files/user/.shell_prompt_color b/_bookworm/home_files/user/.shell_prompt_color similarity index 100% rename from archived/buster/home_files/user/.shell_prompt_color rename to _bookworm/home_files/user/.shell_prompt_color diff --git a/bookworm/home_files/user/.tridactylrc b/_bookworm/home_files/user/.tridactylrc similarity index 100% rename from bookworm/home_files/user/.tridactylrc rename to _bookworm/home_files/user/.tridactylrc diff --git a/bookworm/home_files/user/.xinitrc b/_bookworm/home_files/user/.xinitrc similarity index 100% rename from bookworm/home_files/user/.xinitrc rename to _bookworm/home_files/user/.xinitrc diff --git a/bookworm/home_files/user/mail_sync.sh b/_bookworm/home_files/user/mail_sync.sh similarity index 100% rename from bookworm/home_files/user/mail_sync.sh rename to _bookworm/home_files/user/mail_sync.sh diff --git a/bookworm/home_files/user/public_repos/repos b/_bookworm/home_files/user/public_repos/repos similarity index 100% rename from bookworm/home_files/user/public_repos/repos rename to _bookworm/home_files/user/public_repos/repos diff --git a/bookworm/home_files/w530/.config/i3/config_bonus b/_bookworm/home_files/w530/.config/i3/config_bonus similarity index 100% rename from bookworm/home_files/w530/.config/i3/config_bonus rename to _bookworm/home_files/w530/.config/i3/config_bonus diff --git a/bookworm/home_files/w530/.xinitrc_bonus b/_bookworm/home_files/w530/.xinitrc_bonus similarity index 100% rename from bookworm/home_files/w530/.xinitrc_bonus rename to _bookworm/home_files/w530/.xinitrc_bonus diff --git a/bookworm/setup_scripts/_setup.sh b/_bookworm/setup_scripts/_setup.sh similarity index 100% rename from bookworm/setup_scripts/_setup.sh rename to _bookworm/setup_scripts/_setup.sh diff --git a/bookworm/setup_scripts/copy_dirtree.sh b/_bookworm/setup_scripts/copy_dirtree.sh similarity index 100% rename from bookworm/setup_scripts/copy_dirtree.sh rename to _bookworm/setup_scripts/copy_dirtree.sh diff --git a/bookworm/setup_scripts/init_user_and_keybased_login.sh b/_bookworm/setup_scripts/init_user_and_keybased_login.sh similarity index 100% rename from bookworm/setup_scripts/init_user_and_keybased_login.sh rename to _bookworm/setup_scripts/init_user_and_keybased_login.sh diff --git a/bookworm/setup_scripts/init_user_login.sh b/_bookworm/setup_scripts/init_user_login.sh similarity index 100% rename from bookworm/setup_scripts/init_user_login.sh rename to _bookworm/setup_scripts/init_user_login.sh diff --git a/bookworm/setup_scripts/install_for_target.sh b/_bookworm/setup_scripts/install_for_target.sh similarity index 100% rename from bookworm/setup_scripts/install_for_target.sh rename to _bookworm/setup_scripts/install_for_target.sh diff --git a/bookworm/setup_scripts/migrate_borg.sh b/_bookworm/setup_scripts/migrate_borg.sh similarity index 100% rename from bookworm/setup_scripts/migrate_borg.sh rename to _bookworm/setup_scripts/migrate_borg.sh diff --git a/bookworm/setup_scripts/mirror_dir.sh b/_bookworm/setup_scripts/mirror_dir.sh similarity index 100% rename from bookworm/setup_scripts/mirror_dir.sh rename to _bookworm/setup_scripts/mirror_dir.sh diff --git a/bookworm/setup_scripts/misc.sh b/_bookworm/setup_scripts/misc.sh similarity index 100% rename from bookworm/setup_scripts/misc.sh rename to _bookworm/setup_scripts/misc.sh diff --git a/bookworm/setup_scripts/prepare_to_meet_server.sh b/_bookworm/setup_scripts/prepare_to_meet_server.sh similarity index 100% rename from bookworm/setup_scripts/prepare_to_meet_server.sh rename to _bookworm/setup_scripts/prepare_to_meet_server.sh diff --git a/bookworm/setup_scripts/purge_nonrequireds.sh b/_bookworm/setup_scripts/purge_nonrequireds.sh similarity index 100% rename from bookworm/setup_scripts/purge_nonrequireds.sh rename to _bookworm/setup_scripts/purge_nonrequireds.sh diff --git a/bookworm/setup_scripts/set_hostname_and_fqdn.sh b/_bookworm/setup_scripts/set_hostname_and_fqdn.sh similarity index 100% rename from bookworm/setup_scripts/set_hostname_and_fqdn.sh rename to _bookworm/setup_scripts/set_hostname_and_fqdn.sh diff --git a/bookworm/setup_scripts/setup_desktop.sh b/_bookworm/setup_scripts/setup_desktop.sh similarity index 100% rename from bookworm/setup_scripts/setup_desktop.sh rename to _bookworm/setup_scripts/setup_desktop.sh diff --git a/bookworm/setup_scripts/setup_firefox.sh b/_bookworm/setup_scripts/setup_firefox.sh similarity index 100% rename from bookworm/setup_scripts/setup_firefox.sh rename to _bookworm/setup_scripts/setup_firefox.sh diff --git a/bookworm/setup_scripts/setup_home.sh b/_bookworm/setup_scripts/setup_home.sh similarity index 100% rename from bookworm/setup_scripts/setup_home.sh rename to _bookworm/setup_scripts/setup_home.sh diff --git a/bookworm/setup_scripts/setup_nvidia.sh b/_bookworm/setup_scripts/setup_nvidia.sh similarity index 100% rename from bookworm/setup_scripts/setup_nvidia.sh rename to _bookworm/setup_scripts/setup_nvidia.sh diff --git a/bookworm/setup_scripts/setup_seedbox.sh b/_bookworm/setup_scripts/setup_seedbox.sh similarity index 100% rename from bookworm/setup_scripts/setup_seedbox.sh rename to _bookworm/setup_scripts/setup_seedbox.sh diff --git a/bookworm/setup_scripts/setup_server.sh b/_bookworm/setup_scripts/setup_server.sh similarity index 100% rename from bookworm/setup_scripts/setup_server.sh rename to _bookworm/setup_scripts/setup_server.sh diff --git a/bookworm/setup_scripts/setup_static_website.sh b/_bookworm/setup_scripts/setup_static_website.sh similarity index 100% rename from bookworm/setup_scripts/setup_static_website.sh rename to _bookworm/setup_scripts/setup_static_website.sh diff --git a/bookworm/setup_scripts/setup_web.sh b/_bookworm/setup_scripts/setup_web.sh similarity index 100% rename from bookworm/setup_scripts/setup_web.sh rename to _bookworm/setup_scripts/setup_web.sh diff --git a/bookworm/setup_scripts/upgrade_from_older_release.sh b/_bookworm/setup_scripts/upgrade_from_older_release.sh similarity index 100% rename from bookworm/setup_scripts/upgrade_from_older_release.sh rename to _bookworm/setup_scripts/upgrade_from_older_release.sh diff --git a/constants.sh b/archived/__constants.sh similarity index 100% rename from constants.sh rename to archived/__constants.sh diff --git a/many_releases/aptmark/all b/archived/__many_releases/aptmark/all similarity index 100% rename from many_releases/aptmark/all rename to archived/__many_releases/aptmark/all diff --git a/many_releases/aptmark/raspi b/archived/__many_releases/aptmark/raspi similarity index 100% rename from many_releases/aptmark/raspi rename to archived/__many_releases/aptmark/raspi diff --git a/archived/buster/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies b/archived/__many_releases/etc/all/apt/apt.conf.d/99_minimize_dependencies similarity index 100% rename from archived/buster/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies rename to archived/__many_releases/etc/all/apt/apt.conf.d/99_minimize_dependencies diff --git a/many_releases/etc/all/locale.conf b/archived/__many_releases/etc/all/locale.conf similarity index 100% rename from many_releases/etc/all/locale.conf rename to archived/__many_releases/etc/all/locale.conf diff --git a/archived/buster/etc_files/all/etc/locale.gen b/archived/__many_releases/etc/all/locale.gen similarity index 100% rename from archived/buster/etc_files/all/etc/locale.gen rename to archived/__many_releases/etc/all/locale.gen diff --git a/archived/buster/etc_files/all/etc/timezone b/archived/__many_releases/etc/all/timezone similarity index 100% rename from archived/buster/etc_files/all/etc/timezone rename to archived/__many_releases/etc/all/timezone diff --git a/many_releases/etc/raspi/greetd/config.toml b/archived/__many_releases/etc/raspi/greetd/config.toml similarity index 100% rename from many_releases/etc/raspi/greetd/config.toml rename to archived/__many_releases/etc/raspi/greetd/config.toml diff --git a/many_releases/etc/raspi/ssh/sshd_config b/archived/__many_releases/etc/raspi/ssh/sshd_config similarity index 100% rename from many_releases/etc/raspi/ssh/sshd_config rename to archived/__many_releases/etc/raspi/ssh/sshd_config diff --git a/many_releases/etc/raspi/systemd/system/throttle_cpu.service b/archived/__many_releases/etc/raspi/systemd/system/throttle_cpu.service similarity index 100% rename from many_releases/etc/raspi/systemd/system/throttle_cpu.service rename to archived/__many_releases/etc/raspi/systemd/system/throttle_cpu.service diff --git a/many_releases/home/all/.bashrc b/archived/__many_releases/home/all/.bashrc similarity index 100% rename from many_releases/home/all/.bashrc rename to archived/__many_releases/home/all/.bashrc diff --git a/bookworm/home_files/user/.gitconfig b/archived/__many_releases/home/all/.gitconfig similarity index 100% rename from bookworm/home_files/user/.gitconfig rename to archived/__many_releases/home/all/.gitconfig diff --git a/many_releases/home/raspi/.config/mpv/mpv.conf b/archived/__many_releases/home/raspi/.config/mpv/mpv.conf similarity index 100% rename from many_releases/home/raspi/.config/mpv/mpv.conf rename to archived/__many_releases/home/raspi/.config/mpv/mpv.conf diff --git a/many_releases/home/raspi/.config/sway/config b/archived/__many_releases/home/raspi/.config/sway/config similarity index 100% rename from many_releases/home/raspi/.config/sway/config rename to archived/__many_releases/home/raspi/.config/sway/config diff --git a/many_releases/home/raspi/.nonpath_bins/on_session_start.sh b/archived/__many_releases/home/raspi/.nonpath_bins/on_session_start.sh similarity index 100% rename from many_releases/home/raspi/.nonpath_bins/on_session_start.sh rename to archived/__many_releases/home/raspi/.nonpath_bins/on_session_start.sh diff --git a/many_releases/home/raspi/.nonpath_bins/status.sh b/archived/__many_releases/home/raspi/.nonpath_bins/status.sh similarity index 100% rename from many_releases/home/raspi/.nonpath_bins/status.sh rename to archived/__many_releases/home/raspi/.nonpath_bins/status.sh diff --git a/many_releases/home/raspi/.profile b/archived/__many_releases/home/raspi/.profile similarity index 100% rename from many_releases/home/raspi/.profile rename to archived/__many_releases/home/raspi/.profile diff --git a/many_releases/home/raspi_root/throttle_cpu.sh b/archived/__many_releases/home/raspi_root/throttle_cpu.sh similarity index 100% rename from many_releases/home/raspi_root/throttle_cpu.sh rename to archived/__many_releases/home/raspi_root/throttle_cpu.sh diff --git a/bookworm/home_files/root/.shell_prompt_color b/archived/__many_releases/home/root/.shell_prompt_color similarity index 100% rename from bookworm/home_files/root/.shell_prompt_color rename to archived/__many_releases/home/root/.shell_prompt_color diff --git a/many_releases/scripts/_misc.sh b/archived/__many_releases/scripts/_misc.sh similarity index 100% rename from many_releases/scripts/_misc.sh rename to archived/__many_releases/scripts/_misc.sh diff --git a/archived/all_new_2018/apt-mark/all b/archived/all_new_2018/apt-mark/all deleted file mode 100644 index f748f3b..0000000 --- a/archived/all_new_2018/apt-mark/all +++ /dev/null @@ -1,9 +0,0 @@ -# connectivity: ifupdown seems necessary everyhwere, isc-dhcp-client -# unpredictably so -ifupdown -isc-dhcp-client -# git for the setup directory; cloning works with ca-certificates -ca-certificates -git -# to avoid constant warnings about no locale being found -locales diff --git a/archived/all_new_2018/apt-mark/server b/archived/all_new_2018/apt-mark/server deleted file mode 100644 index 4f7fc5d..0000000 --- a/archived/all_new_2018/apt-mark/server +++ /dev/null @@ -1,7 +0,0 @@ -# needed to log in to server via ssh -openssh-server -# provides /etc/inputrc and understanding of ctrl+arrow key combos -readline-common -# provides systemd scripts that configure iptables via /etc/iptables/* -iptables-persistent -# this line is here because the shell "read" in install_for_target.sh ignores lines without final newline \ No newline at end of file diff --git a/archived/all_new_2018/borg.sh b/archived/all_new_2018/borg.sh deleted file mode 100755 index 18321b1..0000000 --- a/archived/all_new_2018/borg.sh +++ /dev/null @@ -1,145 +0,0 @@ -#!/bin/sh -set -e - -standard_repo="borg" -config_file="${HOME}/.borgrepos" - -usage() { - echo "Need operation as argument, one of:" - echo "init" - echo "store" - echo "check" - echo "export_keyfiles" - echo "orgpush" - echo "orgpull" - false -} - -read_pw() { - if [ "${#SSH_AGENT_PID}" -eq 0 ]; then - eval $(ssh-agent) - echo "ssh-add" - stty -echo - ssh-add - stty echo - fi - if [ "${#BORG_PASSPHRASE}" -eq 0 ]; then - stty -echo - printf "Borg passphrase: " - read password - stty echo - printf "\n" - export BORG_PASSPHRASE="${password}" - fi -} - -if [ ! -f "${config_file}" ]; then - echo '# file read ends at last newline' >> "${config_file}" -fi -if [ "$#" -lt 1 ]; then - usage -fi -first_arg="$1" -shift -if [ "${first_arg}" = "init" ]; then - if [ ! "$#" -eq 1 ]; then - echo "Need exactly one argument: target of form user@server" - false - fi - target="$1" - echo "Initializing: ${target}" - borg init --verbose --encryption=keyfile "${target}:${standard_repo}" - tmp_file="/tmp/new_borgrepos" - echo "${target}" > "${tmp_file}" - cat "${config_file}" >> "${tmp_file}" - cp "${tmp_file}" "${config_file}" -elif [ "${first_arg}" = "store" ]; then - if [ ! "$#" -eq 2 ]; then - echo "Need precisely two arguments: archive name and path to archive." - false - fi - archive_name=$1 - shift - to_backup="$@" - read_pw - cat "${config_file}" | while read line; do - first_char=$(echo "${line}" | cut -c1) - if [ "${first_char}" = "#" ]; then - continue - fi - repo="${line}:${standard_repo}" - archive="${repo}::${archive_name}-{utcnow:%Y-%m-%dT%H:%M}" - echo "Creating archive: ${archive}" - borg create --verbose --list "${archive}" "${to_backup}" - done -elif [ "${first_arg}" = "check" ]; then - if [ ! "$#" -eq 0 ]; then - echo "Need no arguments" - false - fi - read_pw - cat "${config_file}" | while read line; do - first_char=$(echo "${line}" | cut -c1) - if [ "${first_char}" = "#" ]; then - continue - fi - repo="${line}:${standard_repo}" - echo "Checking repo: ${repo}" - borg check --verbose "${repo}" - done -elif [ "${first_arg}" = "export_keyfiles" ]; then - if [ ! "$#" -eq 1 ]; then - echo "Need output tar file name." - false - fi - tar_target="${1}" - tmp_dir="${HOME}/.borgtmp" - keyfiles_dir="${tmp_dir}/borg_keyfiles" - mkdir -p "${keyfiles_dir}" - cat "${config_file}" | while read line; do - first_char=$(echo "${line}" | cut -c1) - if [ "${first_char}" = "#" ]; then - continue - fi - repo="${line}:${standard_repo}" - borg key export "${repo}" "${keyfiles_dir}/${line}" - done - cur_dir="$(pwd)" - cd "${tmp_dir}" - target=$(basename "${keyfiles_dir}") - tar cf "${tar_target}" "${target}" - mv "${tar_target}" "${cur_dir}" - cd - rm -rf "${tmp_dir}" -elif [ "${first_arg}" = "orgpush" ]; then - archive_name="orgdir" - to_backup=~/org - read_pw - cat "${config_file}" | while read line; do - first_char=$(echo "${line}" | cut -c1) - if [ "${first_char}" = "#" ]; then - continue - fi - repo="${line}:${standard_repo}" - archive="${repo}::${archive_name}-{utcnow:%Y-%m-%dT%H:%M}" - echo "Creating archive: ${archive}" - borg create --verbose --list "${archive}" "${to_backup}" --exclude ~/org/.git - done -elif [ "${first_arg}" = "orgpull" ]; then - archive_name="orgdir" - read_pw - cd / - cat "${config_file}" | while read line; do - first_char=$(echo "${line}" | cut -c1) - if [ "${first_char}" = "#" ]; then - continue - fi - repo="${line}:${standard_repo}" - archive=$(borg list "${repo}" | grep "${orgdir}" | tail -1 | cut -f1 -d' ') - echo "Pulling archive: ${archive}" - borg extract --verbose "${repo}::${archive}" - break - done -else - usage -fi diff --git a/archived/all_new_2018/linkable_etc_files/all/etc/apt/sources.list b/archived/all_new_2018/linkable_etc_files/all/etc/apt/sources.list deleted file mode 100644 index 68064c6..0000000 --- a/archived/all_new_2018/linkable_etc_files/all/etc/apt/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian stretch main contrib non-free -deb http://deb.debian.org/debian-security/ stretch/updates main contrib non-free -deb http://deb.debian.org/debian stretch-updates main contrib non-free -deb http://ftp.debian.org/debian stretch-backports main contrib non-free \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/aliases b/archived/all_new_2018/linkable_etc_files/mail/etc/aliases deleted file mode 100644 index 59c52b4..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/aliases +++ /dev/null @@ -1,23 +0,0 @@ -# /etc/aliases - -# As per RFC 2142. -mailer-daemon: plom -postmaster: plom -hostmaster: plom -usenet: plom -news: plom -webmaster: plom -www: plom -ftp: plom -abuse: plom -noc: plom -security: plom -root: plom - -# Personal aliases. -plomlompom: plom -christian.heller: plom -christian_heller: plom -christianheller: plom -c.heller: plom -heller: plom diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-auth.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-auth.conf deleted file mode 100644 index 4a8549c..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-auth.conf +++ /dev/null @@ -1,3 +0,0 @@ -# This is only necessary when we use dovecot's LMTP mechanism to receive -# mail from postfix. -auth_username_format = %Ln diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-lmtp.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-lmtp.conf deleted file mode 100644 index 097f04e..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-lmtp.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Add sieve filtering. -protocol lmtp { - mail_plugins = $mail_plugins sieve -} diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-mail.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-mail.conf deleted file mode 100644 index 1ea9178..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-mail.conf +++ /dev/null @@ -1 +0,0 @@ -mail_privileged_group = mail \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-master.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-master.conf deleted file mode 100644 index f8c5b43..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-master.conf +++ /dev/null @@ -1,20 +0,0 @@ -service auth { - unix_listener auth-userdb { - } - - unix_listener /var/spool/postfix/private/auth { - mode = 0660 - user = postfix - group = postfix - } -} - -# We don't strictly need to provide a LMTP server to fetch mail from -# postfix, but we do if we want to do sophisticated stuff like sieve -# filtering on the way. -service lmtp { - inet_listener lmtp { - address = 127.0.0.1 - port = 2424 - } -} diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-ssl.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-ssl.conf deleted file mode 100644 index 7fa2f5f..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/dovecot/conf.d/99-ssl.conf +++ /dev/null @@ -1 +0,0 @@ -ssl = required diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/iptables/rules.v4 b/archived/all_new_2018/linkable_etc_files/mail/etc/iptables/rules.v4 deleted file mode 100644 index 2950321..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/iptables/rules.v4 +++ /dev/null @@ -1,20 +0,0 @@ -*filter -:INPUT DROP [0:0] -:FORWARD DROP [0:0] -:OUTPUT ACCEPT [0:0] -# otherwise self-referential connections to local host will fail --A INPUT -i lo -j ACCEPT -# this enables ping etc. --A INPUT -p icmp -j ACCEPT -# tolerate any inbound connections requested by our server, no matter the port --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# SMTP (allowing for STARTTLS); necessary for mail server to mail server banter --A INPUT -p tcp --dport 25 -j ACCEPT -# SMTPS, for mail server to mail user agent communication --A INPUT -p tcp --dport 465 -j ACCEPT -# IMAPS --A INPUT -p tcp --dport 993 -j ACCEPT -COMMIT -# this last line is here because iptables-restore ignores the final command if no newline follows it \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf deleted file mode 100644 index 44efe26..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/mailutils.conf +++ /dev/null @@ -1,4 +0,0 @@ -# mailutils by default uses the FQDN as the mail domain name, fix this -address { - email-domain REPLACE_maildomain_ECALPER; -}; diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/opendkim.conf b/archived/all_new_2018/linkable_etc_files/mail/etc/opendkim.conf deleted file mode 100644 index dbd31b4..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/opendkim.conf +++ /dev/null @@ -1,86 +0,0 @@ -# This is a basic configuration that can easily be adapted to suit a standard -# installation. For more advanced options, see opendkim.conf(5) and/or -# /usr/share/doc/opendkim/examples/opendkim.conf.sample. - -# Log to syslog -Syslog yes -# Required to use local socket with MTAs that access the socket as a non- -# privileged user (e.g. Postfix) -UMask 007 - -# Sign for example.com with key in /etc/dkimkeys/dkim.key using -# selector '2007' (e.g. 2007._domainkey.example.com) -#Domain example.com -#KeyFile /etc/dkimkeys/dkim.key -#Selector 2007 -Domain REPLACE_Domain_ECALPER -KeyFile /etc/dkimkeys/REPLACE_Selector_ECALPER.private -Selector REPLACE_Selector_ECALPER - -# Commonly-used options; the commented-out versions show the defaults. -#Canonicalization simple -#Mode sv -#SubDomains no -#SubDomains yes -Canonicalization relaxed/simple - -# Socket smtp://localhost -# -# ## Socket socketspec -# ## -# ## Names the socket where this filter should listen for milter connections -# ## from the MTA. Required. Should be in one of these forms: -# ## -# ## inet:port@address to listen on a specific interface -# ## inet:port to listen on all interfaces -# ## local:/path/to/socket to listen on a UNIX domain socket -# -#Socket inet:8892@localhost -#Socket local:/var/run/opendkim/opendkim.sock -Socket inet:12301@localhost - -## PidFile filename -### default (none) -### -### Name of the file where the filter should write its pid before beginning -### normal operations. -# -PidFile /var/run/opendkim/opendkim.pid - - -# Always oversign From (sign using actual From and a null From to prevent -# malicious signatures header fields (From and/or others) between the signer -# and the verifier. From is oversigned by default in the Debian pacakge -# because it is often the identity key used by reputation systems and thus -# somewhat security sensitive. -OversignHeaders From - -## ResolverConfiguration filename -## default (none) -## -## Specifies a configuration file to be passed to the Unbound library that -## performs DNS queries applying the DNSSEC protocol. See the Unbound -## documentation at http://unbound.net for the expected content of this file. -## The results of using this and the TrustAnchorFile setting at the same -## time are undefined. -## In Debian, /etc/unbound/unbound.conf is shipped as part of the Suggested -## unbound package - -# ResolverConfiguration /etc/unbound/unbound.conf - -## TrustAnchorFile filename -## default (none) -## -## Specifies a file from which trust anchor data should be read when doing -## DNS queries and applying the DNSSEC protocol. See the Unbound documentation -## at http://unbound.net for the expected format of this file. - -TrustAnchorFile /usr/share/dns/root.key - -## Userid userid -### default (none) -### -### Change to user "userid" before starting normal operation? May include -### a group ID as well, separated from the userid by a colon. -# -UserID opendkim \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/main.cf b/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/main.cf deleted file mode 100644 index 7074961..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/main.cf +++ /dev/null @@ -1,59 +0,0 @@ -# See /usr/share/postfix/main.cf.dist for a commented, more complete version - - -# Debian specific: Specifying a file name will cause the first -# line of that file to be used as the name. The Debian default -# is /etc/mailname. -#myorigin = /etc/mailname - -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -biff = no - -# appending .domain is the MUA's job. -append_dot_mydomain = no - -# Uncomment the next line to generate "delayed mail" warnings -#delay_warning_time = 4h - -readme_directory = no - -# See http://www.postfix.org/COMPATIBILITY_README.html -- default to 2 on -# fresh installs. -compatibility_level = 2 - -# TLS parameters (excluding smtpd_tls_(cert|key)_file for own adaption below) -smtpd_use_tls=yes -smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache -smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache - -# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for -# information on enabling SSL in the smtp client. - -smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination -myorigin = /etc/mailname -myhostname = REPLACE_myhostname_ECALPER -alias_maps = hash:/etc/aliases -alias_database = hash:/etc/aliases -mydestination = $myhostname localhost.$mydomain localhost REPLACE_mydomain_if_domainwide_ECALPER -relayhost = -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 -mailbox_size_limit = 0 -recipient_delimiter = + -inet_interfaces = all -inet_protocols = all - -# plomlompom-specific adaptions to allow TLS and SASL via LetsEncrypt/Dovecot. -smtpd_tls_cert_file=/etc/letsencrypt/live/${myhostname}/fullchain.pem -smtpd_tls_key_file=/etc/letsencrypt/live/${myhostname}/privkey.pem -smtpd_sasl_type = dovecot -smtpd_sasl_path = private/auth - -# connect to opendkim -smtpd_milters = inet:localhost:12301 -non_smtpd_milters = inet:localhost:12301 - -# transport mail to dovecot; not strictly needed, as even without this -# postfix will throw mail to /var/mail/USER to be found by dovecot for -# serving via IMAP etc.; but using dovecot's LMTP server for delivery -# allows us to do stuff like dovecot-side sieve filtering. -mailbox_transport = lmtp:inet:127.0.0.1:2424 \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/master.cf b/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/master.cf deleted file mode 100644 index bce1262..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/postfix/master.cf +++ /dev/null @@ -1,124 +0,0 @@ -# -# Postfix master process configuration file. For details on the format -# of the file, see the master(5) manual page (command: "man 5 master" or -# on-line: http://www.postfix.org/master.5.html). -# -# Do not forget to execute "postfix reload" after editing this file. -# -# ========================================================================== -# service type private unpriv chroot wakeup maxproc command + args -# (yes) (yes) (no) (never) (100) -# ========================================================================== -smtp inet n - y - - smtpd -#smtp inet n - y - 1 postscreen -#smtpd pass - - y - - smtpd -#dnsblog unix - - y - 0 dnsblog -#tlsproxy unix - - y - 0 tlsproxy -#submission inet n - y - - smtpd -# -o syslog_name=postfix/submission -# -o smtpd_tls_security_level=encrypt -# -o smtpd_sasl_auth_enable=yes -# -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -smtps inet n - y - - smtpd - -o syslog_name=postfix/smtps - -o smtpd_tls_wrappermode=yes - -o smtpd_sasl_auth_enable=yes - -o smtpd_reject_unlisted_recipient=no -# -o smtpd_client_restrictions=$mua_client_restrictions -# -o smtpd_helo_restrictions=$mua_helo_restrictions -# -o smtpd_sender_restrictions=$mua_sender_restrictions -# -o smtpd_recipient_restrictions= -# -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -# -o milter_macro_daemon_name=ORIGINATING -#628 inet n - y - - qmqpd -pickup unix n - y 60 1 pickup -cleanup unix n - y - 0 cleanup -qmgr unix n - n 300 1 qmgr -#qmgr unix n - n 300 1 oqmgr -tlsmgr unix - - y 1000? 1 tlsmgr -rewrite unix - - y - - trivial-rewrite -bounce unix - - y - 0 bounce -defer unix - - y - 0 bounce -trace unix - - y - 0 bounce -verify unix - - y - 1 verify -flush unix n - y 1000? 0 flush -proxymap unix - - n - - proxymap -proxywrite unix - - n - 1 proxymap -smtp unix - - y - - smtp -relay unix - - y - - smtp -# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 -showq unix n - y - - showq -error unix - - y - - error -retry unix - - y - - error -discard unix - - y - - discard -local unix - n n - - local -virtual unix - n n - - virtual -lmtp unix - - y - - lmtp -anvil unix - - y - 1 anvil -scache unix - - y - 1 scache -# -# ==================================================================== -# Interfaces to non-Postfix software. Be sure to examine the manual -# pages of the non-Postfix software to find out what options it wants. -# -# Many of the following services use the Postfix pipe(8) delivery -# agent. See the pipe(8) man page for information about ${recipient} -# and other message envelope options. -# ==================================================================== -# -# maildrop. See the Postfix MAILDROP_README file for details. -# Also specify in main.cf: maildrop_destination_recipient_limit=1 -# -maildrop unix - n n - - pipe - flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} -# -# ==================================================================== -# -# Recent Cyrus versions can use the existing "lmtp" master.cf entry. -# -# Specify in cyrus.conf: -# lmtp cmd="lmtpd -a" listen="localhost:lmtp" proto=tcp4 -# -# Specify in main.cf one or more of the following: -# mailbox_transport = lmtp:inet:localhost -# virtual_transport = lmtp:inet:localhost -# -# ==================================================================== -# -# Cyrus 2.1.5 (Amos Gouaux) -# Also specify in main.cf: cyrus_destination_recipient_limit=1 -# -#cyrus unix - n n - - pipe -# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user} -# -# ==================================================================== -# Old example of delivery via Cyrus. -# -#old-cyrus unix - n n - - pipe -# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user} -# -# ==================================================================== -# -# See the Postfix UUCP_README file for configuration details. -# -uucp unix - n n - - pipe - flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) -# -# Other external delivery methods. -# -ifmail unix - n n - - pipe - flags=F user=ftn argv=/usr/lib/ifmail/ifmail -r $nexthop ($recipient) -bsmtp unix - n n - - pipe - flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -t$nexthop -f$sender $recipient -scalemail-backend unix - n n - 2 pipe - flags=R user=scalemail argv=/usr/lib/scalemail/bin/scalemail-store ${nexthop} ${user} ${extension} -mailman unix - n n - - pipe - flags=FR user=list argv=/usr/lib/mailman/bin/postfix-to-mailman.py - ${nexthop} ${user} - diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/fetchmail.service b/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/fetchmail.service deleted file mode 100644 index dc8acb4..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/fetchmail.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run plom's fetchmail - -[Service] -Type=oneshot -User=plom -# fetchmail returns 1 when no new mail, we want to catch that -ExecStart=/bin/sh -c 'fetchmail || [ $? -eq 1 ]' diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/pingmail.service b/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/pingmail.service deleted file mode 100644 index e332114..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/pingmail.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Run pingmail check - -[Service] -Type=oneshot -User=plom -ExecStart=/bin/sh -c '~/pingmail/pingmail check' diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/fetchmail.timer b/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/fetchmail.timer deleted file mode 100644 index c67e8e7..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/fetchmail.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run fetchmail once every minute - -[Timer] -OnCalendar=*-*-* *:*:00 - -[Install] -WantedBy=timers.target diff --git a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/pingmail.timer b/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/pingmail.timer deleted file mode 100644 index dba0c9f..0000000 --- a/archived/all_new_2018/linkable_etc_files/mail/etc/systemd/system/timers.target.wants/pingmail.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run pingmail check once every hour - -[Timer] -OnCalendar=*-*-* *:00:00 - -[Install] -WantedBy=timers.target diff --git a/archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/encrypt_chatlogs.service b/archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/encrypt_chatlogs.service deleted file mode 100644 index d0fcb9c..0000000 --- a/archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/encrypt_chatlogs.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Pull website repo -[Service] -Type=oneshot -User=plom -ExecStart=/bin/sh -c '~/encrypter.sh' diff --git a/archived/all_new_2018/linkable_etc_files/sendonly/etc/aliases b/archived/all_new_2018/linkable_etc_files/sendonly/etc/aliases deleted file mode 100644 index 01e159c..0000000 --- a/archived/all_new_2018/linkable_etc_files/sendonly/etc/aliases +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/aliases -postmaster: root -root: plom@plomlompom.com \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/sendonly/etc/postfix/main.cf b/archived/all_new_2018/linkable_etc_files/sendonly/etc/postfix/main.cf deleted file mode 100644 index d081783..0000000 --- a/archived/all_new_2018/linkable_etc_files/sendonly/etc/postfix/main.cf +++ /dev/null @@ -1,38 +0,0 @@ -# See /usr/share/postfix/main.cf.dist for a commented, more complete version - - -# Debian specific: Specifying a file name will cause the first -# line of that file to be used as the name. The Debian default -# is /etc/mailname. -#myorigin = /etc/mailname - -smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU) -biff = no - -# appending .domain is the MUA's job. -append_dot_mydomain = no - -# Uncomment the next line to generate "delayed mail" warnings -#delay_warning_time = 4h - -readme_directory = no - -# See http://www.postfix.org/COMPATIBILITY_README.html -- default to 2 on -# fresh installs. -compatibility_level = 2 - -# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for -# information on enabling SSL in the smtp client. - -smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination -myorigin = /etc/mailname -myhostname = $myorigin -alias_maps = hash:/etc/aliases -alias_database = hash:/etc/aliases -mydestination = $myhostname localhost.$mydomain localhost -relayhost = -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 -mailbox_size_limit = 0 -recipient_delimiter = + -inet_interfaces = loopback-only -inet_protocols = all \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/server/etc/iptables/rules.v4 b/archived/all_new_2018/linkable_etc_files/server/etc/iptables/rules.v4 deleted file mode 100644 index 8e0b1f6..0000000 --- a/archived/all_new_2018/linkable_etc_files/server/etc/iptables/rules.v4 +++ /dev/null @@ -1,14 +0,0 @@ -*filter -:INPUT DROP [0:0] -:FORWARD DROP [0:0] -:OUTPUT ACCEPT [0:0] -# otherwise self-referential connections to local host will fail --A INPUT -i lo -j ACCEPT -# tolerate any inbound connections requested by our server, no matter the port --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT -# this enables ping etc. --A INPUT -p icmp -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -COMMIT -# this last line is here because iptables-restore ignores the final command if no newline follows it \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/server/etc/ssh/sshd_config b/archived/all_new_2018/linkable_etc_files/server/etc/ssh/sshd_config deleted file mode 100644 index 89d08ac..0000000 --- a/archived/all_new_2018/linkable_etc_files/server/etc/ssh/sshd_config +++ /dev/null @@ -1,126 +0,0 @@ -# $OpenBSD: sshd_config,v 1.100 2016/08/15 12:32:04 naddy Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key -#HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin no # plomlompom's security rule -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# Expect .ssh/authorized_keys2 to be disregarded by default in future. -#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to yes to enable challenge-response passwords (beware issues with -# some PAM modules and threads) -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes -#GSSAPIStrictAcceptorCheck yes -#GSSAPIKeyExchange no - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin yes -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -X11Forwarding yes -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -PrintMotd no -#PrintLastLog yes -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation sandbox -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS no -#PidFile /var/run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -#ChrootDirectory none -#VersionAddendum none - -# no default banner path -#Banner none - -# Allow client to pass locale environment variables -AcceptEnv LANG LC_* - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server - -ClientAliveInterval 120 -PasswordAuthentication no # plomlompom's security rule diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/cron.d/certbot b/archived/all_new_2018/linkable_etc_files/web/etc/cron.d/certbot deleted file mode 100644 index 1fd8aaf..0000000 --- a/archived/all_new_2018/linkable_etc_files/web/etc/cron.d/certbot +++ /dev/null @@ -1,17 +0,0 @@ -# /etc/cron.d/certbot: crontab entries for the certbot package -# -# Upstream recommends attempting renewal twice a day -# -# Eventually, this will be an opportunity to validate certificates -# haven't been revoked, etc. Renewal will only occur if expiration -# is within 30 days. -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -# plomlompom added the --webroot -w /var/www/html/ so that renewal -# works with nginx running, and the nginx reload post-hook so that -# the new certificates are linked to by nginx. Note that by default -# we rely on the systemd timer service file instead of this cronjob, -# but since both are installed by the certbot package to serve which -# ever of the two is used, we cautiously adapt both of them too. -0 */12 * * * root test -x /usr/bin/certbot -a \! -d /run/systemd/system && perl -e 'sleep int(rand(3600))' && certbot -q renew --webroot -w /var/www/html/ --post-hook "service nginx reload" diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/gitweb.conf b/archived/all_new_2018/linkable_etc_files/web/etc/gitweb.conf deleted file mode 100644 index 71ce3c5..0000000 --- a/archived/all_new_2018/linkable_etc_files/web/etc/gitweb.conf +++ /dev/null @@ -1,19 +0,0 @@ -# path to git projects (.git) -$projectroot = "/var/public_repos"; - -# directory to use for temp files -# explicitely set by Debian so it's probably a good choice -$git_temp = "/tmp"; - -# git-diff-tree(1) options to use for generated patches -# we don't want to to guess renames, so empty -@diff_opts = (); - -# Base path for where to find the repos for cloning. -@git_base_url_list = ('https://REPLACE_fqdn_ECALPER/repos/clone'); - -# allow snapshots -$feature{'snapshot'}{'default'} = ['zip', 'tgz']; - -# insert header for GDPR compliance -$site_header = "/var/www/header.html" diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/iptables/rules.v4 b/archived/all_new_2018/linkable_etc_files/web/etc/iptables/rules.v4 deleted file mode 100644 index 9b714c6..0000000 --- a/archived/all_new_2018/linkable_etc_files/web/etc/iptables/rules.v4 +++ /dev/null @@ -1,18 +0,0 @@ -*filter -:INPUT DROP [0:0] -:FORWARD DROP [0:0] -:OUTPUT ACCEPT [0:0] -# otherwise self-referential connections to local host will fail --A INPUT -i lo -j ACCEPT -# tolerate any inbound connections requested by our server, no matter the port --A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT -# this enables ping etc. --A INPUT -p icmp -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# HTTP --A INPUT -p tcp --dport 80 -j ACCEPT -# HTTPS --A INPUT -p tcp --dport 443 -j ACCEPT -COMMIT -# this last line is here because iptables-restore ignores the final command if no newline follows it \ No newline at end of file diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/nginx/nginx.conf b/archived/all_new_2018/linkable_etc_files/web/etc/nginx/nginx.conf deleted file mode 100644 index f1be9e6..0000000 --- a/archived/all_new_2018/linkable_etc_files/web/etc/nginx/nginx.conf +++ /dev/null @@ -1,84 +0,0 @@ -# system integration -user www-data; -worker_processes auto; -pid /run/nginx.pid; - -# we need this for the xslt_stylesheet directive below -#load_module modules/ngx_http_xslt_filter_module.so; - -# is expected even if empty -events { -} - -http { - # define content-type headers - types { - text/html html htm shtml; - text/css css; - text/xml xml; - text/plain txt sh rst md asc; - application/xhtml+xml xhtml; - application/pdf pdf; - image/jpeg jpg jpeg; - image/png png; - } - default_type application/octet_stream; - charset utf-8; - - # logging deactivated due to GDPR - #access_log /var/log/nginx/access.log; - #error_log /var/log/nginx/error.log; - - # HTTP server: only enforce HTTPS - server { - listen 80; - return 301 https://$host$request_uri; - } - - # HTTPS server - server { - listen 443 ssl; - server_name REPLACE_fqdn_ECALPER; - ssl_certificate /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/privkey.pem; - root /var/www/html/; - index index.html index.htm index.nginx-debian.html; - - # serve /var/www/public_repos/* for HTTPS git cloning - location ~ /repos/clone(/.*) { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend; - fastcgi_param GIT_HTTP_EXPORT_ALL ""; - fastcgi_param GIT_PROJECT_ROOT /var/public_repos; - fastcgi_param PATH_INFO $1; - fastcgi_pass unix:/var/run/fcgiwrap.socket; - } - - # gitweb static files - location /repos/static/ { - alias /usr/share/gitweb/static/; - } - - # gitweb; this needs packages fcgiwrap and gitweb - location /repos/ { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi; - fastcgi_param GITWEB_CONFIG /etc/gitweb.conf; - fastcgi_pass unix:/var/run/fcgiwrap.socket; - } - - # login-protected IRC logs - location ~ /irclogs/([^/]+)/ { - auth_basic "$1 logs"; - auth_basic_user_file /var/www/irclogs_pw/$1; - autoindex on; - } - - ## entry for IRC logs - #location /irclogs/ { - # autoindex on; - # autoindex_format xml; - # xslt_stylesheet /var/www/autoindex.xslt; - #} - } -} diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/certbot.service b/archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/certbot.service deleted file mode 100644 index 0d20d1f..0000000 --- a/archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/certbot.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Certbot -Documentation=file:///usr/share/doc/python-certbot-doc/html/index.html -Documentation=https://letsencrypt.readthedocs.io/en/latest/ -[Service] -# plomlompom added the --webroot -w /var/www/html/ so that renewal -# works with nginx running, and the nginx reload post-hook so that -# the new certificates are linked to by nginx. -Type=oneshot -ExecStart=/usr/bin/certbot -q renew --webroot -w /var/www/html/ --post-hook "service nginx reload" -PrivateTmp=true \ No newline at end of file diff --git a/archived/all_new_2018/setup_scripts/add_encryption_key.sh b/archived/all_new_2018/setup_scripts/add_encryption_key.sh deleted file mode 100755 index 71a9488..0000000 --- a/archived/all_new_2018/setup_scripts/add_encryption_key.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -set -e - -# Ensure we have a GPG target to encrypt to. -if [ $# -lt 1 ]; then - echo "Need public key ID as argument." - false -fi -gpg_key="$1" - -config_tree_prefix="${HOME}/config/all_new_2018" -apt -y install gnupg dirmngr -keyservers='sks-keyservers.net/ keys.gnupg.net' -set +e -while true; do - do_break=0 - for keyserver in $(echo "${keyservers}"); do - su plom -c "gpg --no-tty --keyserver $keyserver --recv-key ${gpg_key}" - if [ $? -eq "0" ]; then - do_break=1 - break - fi - echo "Attempt with keyserver ${keyserver} unsuccessful, trying other." - done - if [ "${do_break}" -eq "1" ]; then - break - fi -done -set -e -# TODO: We may remove dirmngr here if only this script installed it. diff --git a/archived/all_new_2018/setup_scripts/hardlink_etc.sh b/archived/all_new_2018/setup_scripts/hardlink_etc.sh deleted file mode 100755 index 9d9acc2..0000000 --- a/archived/all_new_2018/setup_scripts/hardlink_etc.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Hard link files to those in argument-selected subdirectories of -# linkable_etc_files//, e.g. link /etc/foo/bar to -# linkable_etc_files/$1/etc/foo/bar and so on. Create directories as -# necessary. We do the hard linking so files that should be readable to -# non-root in /etc/ remain so despite having a path below /root/, as -# symbolic links point into /root/ without making the targets readable -# to non-root. -# CAUTION: This removes original files at the affected paths. -set -e - -config_tree_prefix="${HOME}/config/all_new_2018" -linkable_files_dir="${config_tree_prefix}/linkable_etc_files" - -for target in "$@"; do - cd "${linkable_files_dir}/${target}" - for path in $(find . -type f); do - linking=$(echo "${path}" | cut -c2-) - linked=$(realpath "${path}") - dir=$(dirname "${linking}") - mkdir -p "${dir}" - ln -f "${linked}" "${linking}" - done -done diff --git a/archived/all_new_2018/setup_scripts/init_user_and_keybased_login.sh b/archived/all_new_2018/setup_scripts/init_user_and_keybased_login.sh deleted file mode 100755 index 6a46c20..0000000 --- a/archived/all_new_2018/setup_scripts/init_user_and_keybased_login.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# This script turns a fresh server with password-based root access to -# one of only key-based access and only to new non-root account plom. -# -# CAUTION: This is optimized for a *fresh* setup. It will overwrite any -# pre-existing ~/.ssh/authorized_keys of user plom with one that solely -# contains the local ~/.ssh/id_rsa.pub, and also any old -# /etc/ssh/sshd_config. -# -# Dependencies: ssh, scp, sshpass, ~/.ssh/id_rsa.pub, properly -# configured sshd_config file in reach. -set -e - -# Location auf a sshd_config with "PermitRootLogin no" and -# "PasswordAuthentication no". -config_tree_prefix="${HOME}/config/all_new_2018" -linkable_files_dir="${config_tree_prefix}/linkable_etc_files/server" -system_path_sshd_config='/etc/ssh/sshd_config' -local_path_sshd_config="${linkable_files_dir}/${system_path_sshd_config}" - -# Ensure we have a server name as argument. -if [ $# -eq 0 ]; then - echo "Need server as argument." - false -fi -server="$1" - -# Ask for root password only once, sshpass will re-use it then often. -stty -echo -printf "Server root password: " -read PW_ROOT -stty echo -printf "\n" -export SSHPASS="${PW_ROOT}" - -# Create user plom, and his ~/.ssh/authorized_keys based on the local -# ~/.ssh/id_rsa.pub; ensure the result has proper permissions and -# ownerships. Then disable root and pw login by copying over the -# sshd_config and restart ssh daemon. -# -# This could be a line or two shorter by using ssh-copy-id, but that -# would require setting a password for user plom otherwise not needed. -sshpass -e scp ~/.ssh/id_rsa.pub root@"${server}":/tmp/authorized_keys -sshpass -e ssh root@"${server}" \ - 'useradd -m plom && '\ - 'mkdir /home/plom/.ssh && '\ - 'chown plom:plom /home/plom/.ssh && '\ - 'chown plom:plom /tmp/authorized_keys && '\ - 'chmod u=rw,go= /tmp/authorized_keys && '\ - 'mv /tmp/authorized_keys /home/plom/.ssh/' -sshpass -e scp "${local_path_sshd_config}" root@"${server}":"${system_path_sshd_config}" -sshpass -e ssh root@"${server}" 'service ssh restart' diff --git a/archived/all_new_2018/setup_scripts/install_for_target.sh b/archived/all_new_2018/setup_scripts/install_for_target.sh deleted file mode 100755 index 53914d6..0000000 --- a/archived/all_new_2018/setup_scripts/install_for_target.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# Walks through the package names in the argument-selected files of -# apt-mark/ and ensures the respective packages are installed. -# -# Ignores anything in an apt-mark/ file after the last newline. -set -e - -config_tree_prefix="${HOME}/config/all_new_2018" -aptmark_dir="${config_tree_prefix}/apt-mark" - -for target in "$@"; do - path="${aptmark_dir}/${target}" - cat "${path}" | while read line; do - echo "$line" - if [ ! $(echo "${line}" | cut -c1) = "#" ]; then - apt-get -y install "${line}" - fi - done -done diff --git a/archived/all_new_2018/setup_scripts/letsencrypt.sh b/archived/all_new_2018/setup_scripts/letsencrypt.sh deleted file mode 100755 index 29ed3b6..0000000 --- a/archived/all_new_2018/setup_scripts/letsencrypt.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# Certify current server with LetsEncrypt. -# Uses hostname -f for the domain we want to certify. -set -e - -# Ensure we have a mail address as argument. -if [ $# -lt 1 ]; then - echo "Need mail address as argument." - false -fi -mail_address="$1" - -# We need certbot to get LetsEncrypt certificates. -apt install -y certbot - -# If port 80 blocked by iptables, open it. -set +e -iptables -C INPUT -p tcp --dport 80 -j ACCEPT -open_iptables="$?" -set -e -if [ "${open_iptables}" -eq "1" ]; then - iptables -A INPUT -p tcp --dport 80 -j ACCEPT -fi - -# Create new certificate and copy it to /etc/letsencrypt. -certbot certonly --standalone --agree-tos -m "${mail_address}" -d "$(hostname -f)" - -# Remove iptables rule to open port 80 if we added it. -if [ "${open_iptables}" -eq "1" ]; then - iptables -D INPUT -p tcp --dport 80 -j ACCEPT -fi diff --git a/archived/all_new_2018/setup_scripts/letsencrypt_get.sh b/archived/all_new_2018/setup_scripts/letsencrypt_get.sh deleted file mode 100755 index c2b3e9f..0000000 --- a/archived/all_new_2018/setup_scripts/letsencrypt_get.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Copy over LetsEncrypt certificates from another server. -set -e - -# Ensure we have a server name as argument. -if [ $# -lt 1 ]; then - echo "Need server as argument." - false -fi -server="$1" - -# Copy over. -ssh -t plom@${server} 'su -c "cd /etc/ && tar cf letsencrypt.tar letsencrypt && chown plom:plom letsencrypt.tar && mv letsencrypt.tar /home/plom/"' -scp plom@${server}:~/letsencrypt.tar . -apt -y install certbot -rmdir /etc/letsencrypt -mv letsencrypt.tar /etc/ -cd /etc/ -tar xf letsencrypt.tar -rm letsencrypt.tar diff --git a/archived/all_new_2018/setup_scripts/prepare_to_meet_server.sh b/archived/all_new_2018/setup_scripts/prepare_to_meet_server.sh deleted file mode 100755 index 13d05ca..0000000 --- a/archived/all_new_2018/setup_scripts/prepare_to_meet_server.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# Do some of the steps necessary to SSH (key-based) with another server. -set -e - -target="$1" - -# We need a public key to copy over, so generate it if not found. -if [ ! -f ~/.ssh/id_rsa.pub ]; then - ssh-keygen -fi - -# Add target to ~/.ssh/known_hosts so we don't get -# asked for permission at inopportune moments. -ssh-keyscan -H "$target" >> ~/.ssh/known_hosts - -# Tell user what to do. -echo "APPEND FOLLOWING TO TARGET'S ~/.ssh/authorized_keys:" -cat ~/.ssh/id_rsa.pub diff --git a/archived/all_new_2018/setup_scripts/purge_nonrequireds.sh b/archived/all_new_2018/setup_scripts/purge_nonrequireds.sh deleted file mode 100755 index e444a55..0000000 --- a/archived/all_new_2018/setup_scripts/purge_nonrequireds.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# This script removes all Debian packages that are not of Priority -# "required" or not depended on by packages of priority "required" -# or not listed in the argument-selected files of apt-mark/. -set -e - -config_tree_prefix="${HOME}/config/all_new_2018" -aptmark_dir="${config_tree_prefix}/apt-mark" - -dpkg-query -Wf '${Package} ${Priority}\n' | grep ' required' | sed 's/ required//' > /tmp/list_white_unsorted -for target in "$@"; do - path="${aptmark_dir}/${target}" - cat "${path}" | while read line; do - if [ ! $(echo "${line}" | cut -c1) = "#" ]; then - echo "${line}" >> /tmp/list_white_unsorted - fi - done -done -sort /tmp/list_white_unsorted > /tmp/list_white -dpkg-query -Wf '${Package}\n' > /tmp/list_all_packages -sort /tmp/list_all_packages > /tmp/foo -mv /tmp/foo /tmp/list_all_packages -comm -3 /tmp/list_all_packages /tmp/list_white > /tmp/list_black -apt-mark auto `cat /tmp/list_black` -DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove -rm /tmp/list_all_packages /tmp/list_white_unsorted /tmp/list_white /tmp/list_black diff --git a/archived/all_new_2018/setup_scripts/set_hostname_and_fqdn.sh b/archived/all_new_2018/setup_scripts/set_hostname_and_fqdn.sh deleted file mode 100755 index 3f95590..0000000 --- a/archived/all_new_2018/setup_scripts/set_hostname_and_fqdn.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Sets hostname and optionally FQDN. -# -# Calls hostname, writes to /etc/hostname and /etc/hosts. For /etc/hosts -# writing follows recommendations from Debian manual at -# -# (section "The hostname resolution") on how to map hostname and possibly -# FQDN to a permanent IP if present (we assume here any non-private IP -# and non-loopback IP returned by hostname -I to fulfill that criterion -# on our systems) or to 127.0.1.1 if not. On the reasoning for separating -# localhost and hostname mapping to different IPs, see -# . -set -e - -hostname="$1" -fqdn="$2" -if [ "${hostname}" = "" ]; then - echo "Need hostname as argument." - false -fi -echo "${hostname}" > /etc/hostname -hostname "${hostname}" - -final_ip="127.0.1.1" -for ip in $(hostname -I); do - range_1=$(echo "${ip}" | cut -d "." -f 1) - range_2=$(echo "${ip}" | cut -d "." -f 2) - if [ "${range_1}" -eq 127 ]; then - continue - elif [ "${range_1}" -eq 10 ]; then - continue - elif [ "${range_1}" -eq 172 ]; then - if [ "${range_2}" -ge 16 ] && [ "${range_2}" -le 31 ]; then - continue - fi - elif [ "${range_1}" -eq 192 ]; then - if [ "${range_2}" -eq 168 ]; then - continue - fi - fi - final_ip="${ip}" -done - -echo "127.0.0.1 localhost.localdomain localhost" > /etc/hosts -echo "${final_ip} ${fqdn} ${hostname}" >> /etc/hosts diff --git a/archived/all_new_2018/setup_scripts/setup_mail.sh b/archived/all_new_2018/setup_scripts/setup_mail.sh deleted file mode 100755 index 2080705..0000000 --- a/archived/all_new_2018/setup_scripts/setup_mail.sh +++ /dev/null @@ -1,94 +0,0 @@ -#/bin/sh -set -e - -# Check we have the necessary arguments. -if [ $# -lt 2 ]; then - echo "Give arguments of mail domain and DKIM selector." - echo "Also, if hosting mail for entire domain, give third argument 'domainwide'." - false -fi -mail_domain="$1" -dkim_selector="$2" -domainwide="$3" - -config_tree_prefix="${HOME}/config/all_new_2018" -setup_scripts_dir="${config_tree_prefix}/setup_scripts" -cd "${setup_scripts_dir}" - -# Set up DKIM key. Only keep opendkim-tools on system if pre-installed. -mkdir -p /etc/dkimkeys/ -set +e -dpkg -s opendkim-tools &> /dev/null -preinstalled="$?" -set -e -if [ ! "${preinstalled}" -eq "0" ]; then - apt install -y opendkim-tools -fi -opendkim-genkey -s "${dkim_selector}" -mv "${dkim_selector}.private" /etc/dkimkeys/ -if [ ! "${preinstalled}" -eq "0" ]; then - apt -y --purge autoremove opendkim-tools -fi - -# Link and adapt mail-server-specific /etc/ files. -./hardlink_etc.sh mail -sed -i "s/REPLACE_maildomain_ECALPER/${mail_domain}/g" /etc/mailutils.conf -sed -i "s/REPLACE_Domain_ECALPER/${mail_domain}/g" /etc/opendkim.conf -sed -i "s/REPLACE_Selector_ECALPER/${dkim_selector}/g" /etc/opendkim.conf -sed -i "s/REPLACE_myhostname_ECALPER/$(hostname -f)/g" /etc/postfix/main.cf -if [ "${domainwide}" = "domainwide" ]; then - sed -i 's/REPLACE_mydomain_if_domainwide_ECALPER/$mydomain/g' /etc/postfix/main.cf -else - sed -i 's/REPLACE_mydomain_if_domainwide_ECALPER//g' /etc/postfix/main.cf -fi -# Since we re-set the iptables rules, we need to reload them. -iptables-restore /etc/iptables/rules.v4 - -# Some useful debconf selections. -echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections -echo "ssl_cert = /etc/dovecot/conf.d/99-ssl-certs.conf -echo "ssl_key = > /etc/dovecot/conf.d/99-ssl-certs.conf - -# The second line should not be necessary due to the first line, but for -# some reason the installation forgets to set up /etc/mailname early -# enough to not (when running newaliases) stumble over its absence. -echo "postfix postfix/mailname string ${mail_domain}" | debconf-set-selections -echo "${mail_domain}" > /etc/mailname - -# Everything should now be ready for installations. Note that we don't -# strictly need dovecot-lmtpd, as postfix will deliver mail to /var/mail/USER -# in any case, to be found by dovecot; we use it as a transport mechanism to -# allow for sophisticated stuff like dovecot-side sieve filtering (installed -# with dovecot-sieve). -apt install -y -o Dpkg::Options::=--force-confold postfix dovecot-imapd dovecot-lmtpd dovecot-sieve opendkim -cp "${config_tree_prefix}/user_files/dovecot.sieve" /home/plom/.dovecot.sieve -chown plom:plom /home/plom/.dovecot.sieve - -# Pingmail setup. -apt install -y mailutils -cp "${config_tree_prefix}/user_files/pingmailrc" /home/plom/.pingmailrc -chown plom:plom /home/plom/.pingmailrc -su plom -c "cd && git clone https://plomlompom.com/repos/clone/pingmail.git" - -# In addition to our postfix server receiving mails, we funnel mails from a -# POP3 account into dovecot via fetchmail. It might make sense to adapt the -# ~/.dovecot.sieve to move mails targeted to the fetched mail account to their -# own mbox. -apt -y install fetchmail -cp "${config_tree_prefix}/user_files/fetchmailrc" /home/plom/.fetchmailrc -chown plom:plom /home/plom/.fetchmailrc -chmod 0700 /home/plom/.fetchmailrc - -# Pingmail and fetchmail have some systemd timers waiting. To let systemd -# know about them, do this. -systemctl daemon-reload - -# Final advice to user. -echo "TODO: Ensure MX entry for your system in your DNS configuration." -echo "TODO: Ensure a proper SPF entry for this system in your DNS configuration; something like 'v=spf1 mx -all' mapped to your host." -echo "TODO: passwd plom for IMAPS login" -echo "TODO: adapt /home/plom/.fetchmailrc and then do: systemctl start fetchmail.timer" -echo "TODO: adapt /home/plom/.dovecot.sieve and /home/plom/.pingmailrc (sieve mail by pingmail target person into mbox defined in .pingmailrc), then run: systemctl start pingmail.timer" -echo "TODO: Add the follow DMARK entry as TXT to your DNS configugration: 'v=DMARC1; p=none; rua=mailto:plom+dmarc@plomlompom.com;' mapped to _dmarc" -echo "TODO: Add the following DKIM entry to your DNS configuration (possibly with slightly changed host entry – if your mail domain includes a subdomain, append that with a dot):" -cat "${dkim_selector}.txt" diff --git a/archived/all_new_2018/setup_scripts/setup_play.sh b/archived/all_new_2018/setup_scripts/setup_play.sh deleted file mode 100755 index f37be49..0000000 --- a/archived/all_new_2018/setup_scripts/setup_play.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -set -e - -# Ensure we have a GPG target to encrypt to. -if [ $# -lt 1 ]; then - echo "Need public key ID as argument." - false -fi -gpg_key="$1" - -config_tree_prefix="${HOME}/config/all_new_2018" -setup_scripts_dir="${config_tree_prefix}/setup_scripts" -cd "${setup_scripts_dir}" - -# If anything strange happens, let root send mail to us. -./setup_sendonly.sh - -# Apart from weechat, vim and screen will also be useful for everyday activity. -apt -y install weechat screen vim - -# Link and copy over files. -./hardlink_etc.sh play -cp "${config_tree_prefix}/user_files/encrypter.sh" /home/plom/ -chown plom:plom /home/plom/encrypter.sh -cp "${config_tree_prefix}/user_files/weechat-wrapper.sh" /home/plom/ -chown plom:plom /home/plom/weechat-wrapper.sh -cp "${config_tree_prefix}/user_files/weechatrc" /home/plom/.weechatrc -chown plom:plom /home/plom/.weechatrc -apt -y install screen -echo "$gpg_key" > /home/plom/.encrypt_target -chown plom:plom /home/plom/.encrypt_target - -# Start encrypt_chatlogs job. -./add_encryption_key.sh "${gpg_key}" -systemctl daemon-reload -systemctl start encrypt_chatlogs.timer diff --git a/archived/all_new_2018/setup_scripts/setup_plomlombot.sh b/archived/all_new_2018/setup_scripts/setup_plomlombot.sh deleted file mode 100755 index de22ef3..0000000 --- a/archived/all_new_2018/setup_scripts/setup_plomlombot.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -set -e - -# Ensure we have a GPG target to encrypt to. -if [ $# -lt 1 ]; then - echo "Need public key ID as argument." - false -fi -gpg_key="$1" - -config_tree_prefix="${HOME}/config/all_new_2018" -irclogs_dir=/var/www/html/irclogs -irclogs_pw_dir=/var/www/irclogs_pw - -./add_encryption_key.sh "${gpg_key}" -apt -y install screen python3-venv -cp "${config_tree_prefix}"/user_files/plomlombot_daemon.sh /home/plom/ -chown plom:plom /home/plom/plomlombot_daemon.sh -su plom -c "cd && git clone /var/public_repos/plomlombot-irc" -systemctl enable /etc/systemd/system/plomlombot.service -service plomlombot start -mkdir -p "${irclogs_dir}" -chown -R plom:plom "${irclogs_dir}" -mkdir -p "${irclogs_pw_dir}" -chown -R plom:plom "${irclogs_pw_dir}" -echo "Don't forget to add a file ~/.plomlombot with content such as:" -echo "gpg_key ${gpg_key}" -echo "bot: SCREEN_SESSION_NAME BOT_NAME #CHANNEL_NAME IRC_SERVER_NAME LOGS_USER LOGS_PW" -echo "# file should end in newline or non-interpreted line such as this" diff --git a/archived/all_new_2018/setup_scripts/setup_sendonly.sh b/archived/all_new_2018/setup_scripts/setup_sendonly.sh deleted file mode 100755 index e761eeb..0000000 --- a/archived/all_new_2018/setup_scripts/setup_sendonly.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# This sets up the minimum of a mail server necessary to send out mails -# to the world. -set -e - -config_tree_prefix="${HOME}/config/all_new_2018" -setup_scripts_dir="${config_tree_prefix}/setup_scripts" -cd "${setup_scripts_dir}" - -./hardlink_etc.sh sendonly -echo "postfix postfix/main_mailer_type string 'Internet Site'" | debconf-set-selections -echo "postfix postfix/mailname string $(hostname -f)" | debconf-set-selections -echo "$(hostname -f)" > /etc/mailname -apt install -y postfix diff --git a/archived/all_new_2018/setup_scripts/setup_server.sh b/archived/all_new_2018/setup_scripts/setup_server.sh deleted file mode 100755 index 172d8d2..0000000 --- a/archived/all_new_2018/setup_scripts/setup_server.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# Next setup steps for a server whose login policy has just been set from -# the outside via ./init_user_and_keybased_login.sh. -set -e - -# Provide maximum input for set_hostname_and_fqdn.sh. -if [ "$#" -ne 2 ]; then - echo 'Need exactly two arguments (hostname, FQDN).' - false -fi -hostname="$1" -fqdn="$2" - -config_tree_prefix="${HOME}/config/all_new_2018" -setup_scripts_dir="${config_tree_prefix}/setup_scripts" -cd "${setup_scripts_dir}" - -# Adapt /etc/ to our needs by hardlinking into ./linkable_etc_files. This -# will set basic configurations affecting following steps, such as setup -# of APT and the locale selection, so needs to be right at the beginning. -./hardlink_etc.sh all server - -# Set hostname and FQDN. -./set_hostname_and_fqdn.sh "${hostname}" "${fqdn}" - -# Some debconf selections we don't want to get asked during coming -# install actions. -echo 'iptables-persistent iptables-persistent/autosave_v4 boolean false' | debconf-set-selections -echo 'iptables-persistent iptables-persistent/autosave_v6 boolean false' | debconf-set-selections - -# Ensure package installation state as defined by what packages are -# defined as required by Debian policy and by settings in ./apt-mark/. -apt update -./install_for_target.sh all server -./purge_nonrequireds.sh all server - -# Ensure our desired locale is available. -locale-gen - -# Only upgrade after reducing the system to the desired minimum, so that -# we don't need to get more data than necessary. -apt -y dist-upgrade - -# Set Berlin localtime. -ln -sf /usr/share/zoneinfo/Europe/Berlin /etc/localtime - -# If we have not yet set the shell for user plom, ensure it here. This -# is mostly for convenience. -usermod -s /bin/bash plom - -# We want to be able to use ALL our servers as borg backup destinations. -apt -y install borgbackup diff --git a/archived/all_new_2018/setup_scripts/setup_web.sh b/archived/all_new_2018/setup_scripts/setup_web.sh deleted file mode 100755 index 400aa22..0000000 --- a/archived/all_new_2018/setup_scripts/setup_web.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# Set up plomlompom.com web server. -set -e - -config_tree_prefix="${HOME}/config/all_new_2018" -setup_scripts_dir="${config_tree_prefix}/setup_scripts" -cd "${setup_scripts_dir}" - -./hardlink_etc.sh web -./setup_sendonly.sh -sed -i "s/REPLACE_fqdn_ECALPER/$(hostname -f)/g" /etc/nginx/nginx.conf -sed -i "s/REPLACE_fqdn_ECALPER/$(hostname -f)/g" /etc/gitweb.conf -cd /var/ -rm -rf www -git clone plom@core.plomlompom.com:repos/website www -apt -y -o Dpkg::Options::=--force-confold install nginx gitweb fcgiwrap -mkdir /var/public_repos -chown plom:plom /var/public_repos -iptables-restore /etc/iptables/rules.v4 diff --git a/archived/all_new_2018/user_files/dovecot.sieve b/archived/all_new_2018/user_files/dovecot.sieve deleted file mode 100644 index 5346309..0000000 --- a/archived/all_new_2018/user_files/dovecot.sieve +++ /dev/null @@ -1,8 +0,0 @@ -require ["fileinto"]; -require ["mailbox"]; -if address :is "from" "foo@bar.com" { - fileinto :create "foo"; -} -if address :is :domain "to" "example.com" { - fileinto :create "example.com"; -} diff --git a/archived/all_new_2018/user_files/encrypter.sh b/archived/all_new_2018/user_files/encrypter.sh deleted file mode 100755 index e2ebd44..0000000 --- a/archived/all_new_2018/user_files/encrypter.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# Encrypt dated weechatlog files older than one day to GPG target defined in -# ~/.encrypt_target -set -e - -gpg_key=$(cat ~/.encrypt_target) -cd ~/weechatlogs/irc/ -find . -regextype posix-egrep -regex '^.*/.*/.*\.[0-9]{4}-[0-9]{2}-[0-9]{2}\.weechatlog$' -type f -mtime +1 -exec gpg --recipient "${gpg_key}" --trust-model always --encrypt {} \; -exec rm {} \; - diff --git a/archived/all_new_2018/user_files/fetchmailrc b/archived/all_new_2018/user_files/fetchmailrc deleted file mode 100755 index b437563..0000000 --- a/archived/all_new_2018/user_files/fetchmailrc +++ /dev/null @@ -1,2 +0,0 @@ -# remove "keep" if you're sure about your setup; it keeps mails on server from getting deleted -poll mail.example.com protocol pop3 username "foo@example.com" password "PASSWORD" ssl keep diff --git a/archived/all_new_2018/user_files/pingmailrc b/archived/all_new_2018/user_files/pingmailrc deleted file mode 100644 index 46bcbfe..0000000 --- a/archived/all_new_2018/user_files/pingmailrc +++ /dev/null @@ -1,45 +0,0 @@ -# place for test files whose modification times are used to track lifesigns -testdir=$HOME'/.pingmail' - -# modification time is the last time a ping was sent or a lifetime received -ping_touch=$testdir'/ping_touch' - -# modification time is when the count for sending checker a warning mail starts -reminder_touch=$testdir'/reminder_touch' - -# how long to wait for lifesigns before sending a ping; double is time to wait -# for a lifesign before sending a warning message to checker -wait_time=86400 - -# address of the checker, receives warning message after too long wait -checker_address='bar@example.org' - -# address of the checked person, ping is sent here -checked_address='foo@example.org' - -# content of ping message sent to checked person -subj2checked='[pingmail] Ping!' -msg2checked='Hi!\n -\nThis is an automated mail ping from '$checker_address'. -\nRespond to show that you are still alive!' - -# content of warning message sent to checker -id_target='foo' -subj2checker='[pingmail] No recent life signs from '$id_target -reminder_time=`expr $wait_time \* 2` -msg2checker='pingmail reporting in:\n -\nNo life signs from '$id_target' for the last '$reminder_time' seconds. -\nMaybe you should give them a call to check if they are okay.' - -# mail client command reading message body from stdin and subject from parameter -mailclient_s='mail -s' - -# mailbox file to check for most recent life sign -mbox=$HOME'/mail/foo' - -# to recursively search for most recent matches to $matchstring as lifesigns -#maildir=$HOME'/mail' - -# pattern to search $maildir for recursively for lifesigns -#checked_address_escaped=`echo $checked_address | sed 's/\./\\./g'` -#matchstring='^From: .*('$checked_address_escaped'|alternate@example\.org)' diff --git a/archived/all_new_2018/user_files/plomlombot_daemon.sh b/archived/all_new_2018/user_files/plomlombot_daemon.sh deleted file mode 100755 index 5cf1f6a..0000000 --- a/archived/all_new_2018/user_files/plomlombot_daemon.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -set -e - -# Repeatedly parse config file for GPG key and bot screen configs. -path=~/.plomlombot -db_dir="${HOME}/plomlombot_db" -irclogs_dir=/var/www/html/irclogs -irclogs_pw_dir=/var/www/irclogs_pw -while true; do - if [ -f "${path}" ]; then - cat "${path}" | while read line; do - first_word=$(echo -n "${line}" | cut -d' ' -f1) - - # Read "bot:" line, start bot screen session from it if not yet existing, - # set up irclogs dir if not yet existing. - if [ "${first_word}" = "bot:" ]; then - session_name=$(echo -n "${line}" | cut -d' ' -f2) - bot_name=$(echo -n "${line}" | cut -d' ' -f3) - channel_name=$(echo -n "${line}" | cut -d' ' -f4) - shortened_channel_name="${channel_name}" - first_char=$(echo -n "${channel_name}" | cut -c1) - if [ "${first_char}" = "#" ]; then - shortened_channel_name=$(echo -n "${channel_name}" | cut -c2-) - fi - server_name=$(echo -n "${line}" | cut -d' ' -f5) - login_user=$(echo -n "${line}" | cut -d' ' -f6) - login_pw=$(echo -n "${line}" | cut -d' ' -f7) - set +e - screen -S "${session_name}" -Q select . > /dev/null - start_screen=$? - set -e - if [ "${start_screen}" -eq "1" ]; then - cd ~/plomlombot-irc - LANG="en_US.UTF-8" screen -d -m -S "${session_name}" ./run.sh -r 604800 -n "${bot_name}" -s "${server_name}" "${channel_name}" - fi - md5_server=$(echo -n "${server_name}" | md5sum | cut -d' ' -f1) - md5_channel=$(echo -n "${channel_name}" | md5sum | cut -d' ' -f1) - logs_dir="${db_dir}/${md5_server}/${md5_channel}/logs" - # FIXME: Note the trouble we will have if we have the same channel - # name on different servers … - ln -sfn "${logs_dir}" "${irclogs_dir}/${shortened_channel_name}" - echo "${login_user}":'{PLAIN}'"${login_pw}" > "${irclogs_pw_dir}/${shortened_channel_name}" - - # If "gpg" line, encrypt old raw logs to that GPG key. - elif [ "${first_word}" = "gpg_key" ]; then - key=$(echo -n "${line}" | cut -d' ' -f2) - mkdir -p ~/plomlombot_db - cd ~/plomlombot_db - find . -path '*/*/raw_logs/*.txt' -mtime +1 -type f -exec gpg --recipient "${key}" --trust-model always --encrypt {} \; -exec rm {} \; - fi - - done - sleep 1 - fi -done diff --git a/archived/all_new_2018/user_files/weechat-wrapper.sh b/archived/all_new_2018/user_files/weechat-wrapper.sh deleted file mode 100755 index 4625dd8..0000000 --- a/archived/all_new_2018/user_files/weechat-wrapper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Enforce ~/.weechatrc as sole persistent weechat config file. -#~/config/bin/simplemail.sh ~/config/mails/weechat_restart_reminder -rm -rf ~/.weechat/ -WEECHATCONF=`tr '\n' ';' < ~/.weechatrc` -weechat -r "$WEECHATCONF" -rm -rf ~/.weechat/ diff --git a/archived/all_new_2018/user_files/weechatrc b/archived/all_new_2018/user_files/weechatrc deleted file mode 100644 index ab30c17..0000000 --- a/archived/all_new_2018/user_files/weechatrc +++ /dev/null @@ -1,7 +0,0 @@ -/set logger.file.path ~/weechatlogs -/set logger.file.flush_delay 0 -/set logger.mask.irc "irc/$server/$channel.%Y-%m-%d.weechatlog" -/set weechat.bar.status.items "[time],[buffer_last_number],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,[lag],[hotlist],completion,scroll,[otr]" -/set weechat.color.chat_nick_colors "lightcyan" -/server add freenode irc.freenode.net -nicks=plimlompom,plimlomp0m,pliml0mp0m -realname="foo bar" -autojoin=#plomlompomtest -/connect freenode diff --git a/archived/ansible/config.yml b/archived/ansible/config.yml deleted file mode 100644 index 3386c91..0000000 --- a/archived/ansible/config.yml +++ /dev/null @@ -1,117 +0,0 @@ ---- -- hosts: all - user: root - become: yes - tasks: - - - name: ensure directories for symlinks exist - file: state=directory dest={{item}} - with_lines: cat ~/config/ansible/files/dirs | sed -e 's/ *#.*$//' - - name: symlink system files - file: state=hard force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}} - with_fileglob: ~/config/ansible/files/system/* - - name: set hostname for current session - shell: hostname w530 - - # Init package management. - - name: update package lists - apt: update_cache=yes - - name: APT - dist-upgrade - apt: upgrade=dist - - # Ensure power management. - - name: ensure power management tools are installed - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/power_management | sed -e 's/ *#.*$//' - - name: start TLP - shell: tlp start - - # Configure console. - # - # For some reason, some settings are only applied two reboots after this. - - name: symlink console config files - file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}} - with_fileglob: ~/config/ansible/files/console/* - - name: ensure locales and console-setup are installed - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/console | sed -e 's/ *#.*$//' - - name: generate en_US.UTF-8 locale - locale_gen: name=en_US.UTF-8 state=present - - name: run setupcon to apply console settings from /etc/default/ - command: setupcon - - # Miscellaneous. - - name: Ensure dotfile symlinks - file: state=link force=yes src={{item}} dest=~/.{{item|basename}} - with_fileglob: - - ~/config/dotfiles/minimal/* - - ~/config/dotfiles/root/* - - name: ensure ~/.vimbackups directory - file: state=directory dest=~/.vimbackups - - name: ensure man-db, manpages are installed - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/man | sed -e 's/ *#.*$//' - - name: set /etc/localtime - file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime - - name: ensure various useful tools are installed – sudo, git, vim, less, openssh - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/various_useful | sed -e 's/ *#.*$//' - - name: ensure boot messages are not cleared on start up - replace: dest=/etc/systemd/system/getty.target.wants/getty@tty1.service regexp='^TTYVTDisallocate=yes.*$' replace='TTYVTDisallocate=no' - - # Config user. - - name: create user plom with sudo privileges and bash shell - user: name=plom groups=sudo shell=/bin/bash - - name: have config repo in user directory - git: repo=https://github.com/plomlompom/config dest=/home/plom/config - become_user: plom - become_method: su - - # Ensure X window environment. - - name: ensure minimal X window environment - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal_x | sed -e 's/ *#.*$//' - - name: ensure 3d acceleration and optimus switch - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//' - - name: ensure user plom is in bumblebee group - user: name=plom groups=bumblebee append=yes - - name: ensure basic X tools - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/basic_x_tools | sed -e 's/ *#.*$//' - - # Set up pentadactyl. - - name: ensure browser environment - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/browser_environment | sed -e 's/ *#.*$//' - - # Ensure wifi. - - name: ensure wifi configuration - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/wifi | sed -e 's/ *#.*$//' - - # Ensure audio/video consumption necessities. - - name: ensure multimedia tools - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/multimedia | sed -e 's/ *#.*$//' - - # Ensure hotkeys. - # - # For some reason, the brightness hotkeys still won't be available unless acpid is restarted (yes, after reboot). - - name: ensure hotkeys - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/hotkeys | sed -e 's/ *#.*$//' - - # Remove undesired packages - - name: collect desired packages - shell: cat files/apt-mark/* | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted - - name: collect currently installed packages - shell: dpkg-query -Wf '${Package}\n' > /tmp/all_unsorted && sort /tmp/all_unsorted > /tmp/all_sorted - - name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed - shell: comm -3 /tmp/all_sorted /tmp/white_list_sorted > /tmp/list_black - - name: mark all packages from black list as automatically installed - shell: apt-mark auto $(cat /tmp/list_black) - - name: mark all packages from white list as manually installed - shell: apt-mark manual $(cat /tmp/white_list_unsorted) - - name: purge all packages automatically installed that are not depended on - shell: DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove diff --git a/archived/ansible/config_new.yml b/archived/ansible/config_new.yml deleted file mode 100644 index f3bd3f5..0000000 --- a/archived/ansible/config_new.yml +++ /dev/null @@ -1,147 +0,0 @@ ---- -- hosts: all - user: root - become: yes - tasks: - - - name: ensure directories for symlinks exist - file: state=directory dest={{item}} - with_lines: cat ~/config/ansible/files/dirs_new | sed -e 's/ *#.*$//' - - name: symlink system files - file: state=hard force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}} - with_fileglob: - - ~/config/ansible/files/system_new/minimal/* - - ~/config/ansible/files/system_new/{{ system_name }}/* - - name: set hostname for current session - shell: hostname {{ system_name }} - - # Init package management. - - name: add palemoon repo signing key - apt_key: - url: https://download.opensuse.org/repositories/home:stevenpusser/Debian_9.0/Release.key - state: present - - name: update package lists - apt: update_cache=yes - - name: APT - dist-upgrade - apt: upgrade=dist - - # Ensure packages needed for disk encryption on startup (how does this work?) - - name: ensure power management tools are installed - apt: name={{item}} state=present - with_lines: - - cat ~/config/ansible/files/apt-mark_new/minimal/disk_encryption | sed -e 's/ *#.*$//' - - # Ensure power management. - - name: ensure power management tools are installed - apt: name={{item}} state=present - with_lines: - - cat ~/config/ansible/files/apt-mark_new/minimal/power_management | sed -e 's/ *#.*$//' - - cat ~/config/ansible/files/apt-mark_new/X200s/power_management | sed -e 's/ *#.*$//' - - name: start TLP - shell: tlp start - - # Configure console. - # - # For some reason, some settings are only applied two reboots after this. - - name: symlink console config files - file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}} - with_fileglob: ~/config/ansible/files/console/* - - name: ensure locales and console-setup are installed - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/console | sed -e 's/ *#.*$//' - - name: generate en_US.UTF-8 locale - locale_gen: name=en_US.UTF-8 state=present - - name: Touch keyboard config file so setupcon does not ignore it. - command: touch /etc/default/keyboard - - name: run setupcon to apply console settings from /etc/default/ - command: setupcon - - # Miscellaneous. - - name: Ensure dotfile symlinks - file: state=link force=yes src={{item}} dest=~/.{{item|basename}} - with_fileglob: - - ~/config/dotfiles/minimal/* - - ~/config/dotfiles/root/* - - name: ensure ~/.vimbackups directory - file: state=directory dest=~/.vimbackups - - name: ensure man-db, manpages are installed - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/man | sed -e 's/ *#.*$//' - - name: set /etc/localtime - file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime - - name: ensure various useful tools are installed – sudo, git, vim, less, openssh - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/various_useful | sed -e 's/ *#.*$//' - - name: ensure boot messages are not cleared on start up - replace: dest=/etc/systemd/system/getty.target.wants/getty@tty1.service regexp='^TTYVTDisallocate=yes.*$' replace='TTYVTDisallocate=no' - - # Config user. - - name: create user plom with sudo privileges and bash shell - user: name=plom groups=sudo shell=/bin/bash - #- name: have config repo in user directory - # git: repo=https://github.com/plomlompom/config dest=/home/plom/config - # become_user: plom - # become_method: su - - # Ensure X window environment. - - name: ensure minimal X window environment - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/minimal_x | sed -e 's/ *#.*$//' - - name: ensure 3d acceleration - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/3d_acceleration | sed -e 's/ *#.*$//' - #- name: ensure optimus switch - # apt: name={{item}} state=present - # with_lines: cat ~/config/ansible/files/apt-mark_new/W530/3d_acceleration | sed -e 's/ *#.*$//' - #- name: ensure user plom is in bumblebee group - # user: name=plom groups=bumblebee append=yes - - name: ensure basic X tools - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/basic_x_tools | sed -e 's/ *#.*$//' - - ## Set up browser environment. - #- name: ensure qutebrowser - # include: tasks/qutebrowser.yml - - name: ensure browser environment - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/browser_environment | sed -e 's/ *#.*$//' - - # Ensure wifi. - - name: ensure wifi configuration - apt: name={{item}} state=present - with_lines: - - cat ~/config/ansible/files/apt-mark_new/minimal/wifi | sed -e 's/ *#.*$//' - - cat ~/config/ansible/files/apt-mark_new/X200s/wifi | sed -e 's/ *#.*$//' - #- name: ensure wicd - # apt: name={{item}} state=present - # with_lines: cat ~/config/ansible/files/apt-mark_new/W530/wicd | sed -e 's/ *#.*$//' - - # Ensure audio/video consumption necessities. - - name: ensure multimedia tools - apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/multimedia | sed -e 's/ *#.*$//' - #- name: ensure multimedia tools - # apt: name={{item}} state=present - # with_lines: cat ~/config/ansible/files/apt-mark_new/W530/multimedia | sed -e 's/ *#.*$//' - - # Ensure hotkeys. - # - # For some reason, the brightness hotkeys still won't be available unless acpid is restarted (yes, after reboot). - #- name: ensure hotkeys - # apt: name={{item}} state=present - # with_lines: cat ~/config/ansible/files/apt-mark/hotkeys | sed -e 's/ *#.*$//' - - # Remove undesired packages - - name: collect desired packages - shell: cat files/apt-mark_new/minimal/* files/apt-mark_new/{{ system_name }}/* | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted - - name: collect currently installed packages - shell: dpkg-query -Wf '${Package}\n' > /tmp/all_unsorted && sort /tmp/all_unsorted > /tmp/all_sorted - - name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed - shell: comm -3 /tmp/all_sorted /tmp/white_list_sorted > /tmp/list_black - - name: mark all packages from black list as automatically installed - shell: apt-mark auto $(cat /tmp/list_black) - - name: mark all packages from white list as manually installed - shell: apt-mark manual $(cat /tmp/white_list_unsorted) - - name: purge all packages automatically installed that are not depended on - shell: DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove - diff --git a/archived/ansible/files/apt-mark/3d_acceleration b/archived/ansible/files/apt-mark/3d_acceleration deleted file mode 100644 index 7d0ba5b..0000000 --- a/archived/ansible/files/apt-mark/3d_acceleration +++ /dev/null @@ -1,5 +0,0 @@ -bumblebee-nvidia -libgl1-mesa-dri # tested as necessary for OpenGL 3D acceleration to work -libglu1-mesa # tested as necessary for OpenGL 3D acceleration to work -linux-headers-amd64 # tested as necessary to build proper nvidia-driver module -primus # bridge by which bumblebee will deliver Nvidia-renderend content to Intel card diff --git a/archived/ansible/files/apt-mark/basic_x_tools b/archived/ansible/files/apt-mark/basic_x_tools deleted file mode 100644 index 9c68622..0000000 --- a/archived/ansible/files/apt-mark/basic_x_tools +++ /dev/null @@ -1,7 +0,0 @@ -i3 -i3status -python3 # this is what the i3status wrapper is written in -redshift -suckless-tools # contains dmenu; not using virtual packages as that won't be marked manually installed -xterm -x11-xserver-utils # includes xrdb which applies .Xresources files diff --git a/archived/ansible/files/apt-mark/browser_environment b/archived/ansible/files/apt-mark/browser_environment deleted file mode 100644 index cc9575c..0000000 --- a/archived/ansible/files/apt-mark/browser_environment +++ /dev/null @@ -1,4 +0,0 @@ -iceweasel -vim-gtk # used by pentadactyl for text editing -xul-ext-noscript -xul-ext-pentadactyl diff --git a/archived/ansible/files/apt-mark/console b/archived/ansible/files/apt-mark/console deleted file mode 100644 index 01bcbf8..0000000 --- a/archived/ansible/files/apt-mark/console +++ /dev/null @@ -1,2 +0,0 @@ -console-setup -locales diff --git a/archived/ansible/files/apt-mark/core b/archived/ansible/files/apt-mark/core deleted file mode 100644 index 43afba8..0000000 --- a/archived/ansible/files/apt-mark/core +++ /dev/null @@ -1,55 +0,0 @@ -base-files -base-passwd -bash -bsdutils -coreutils -dash -debconf -debianutils -diffutils -dpkg -e2fslibs -e2fsprogs -findutils -gcc-6-base -grep -gzip -hostname -init-system-helpers -libacl1 -libattr1 -libblkid1 -libc6 -libc-bin -libcomerr2 -libfdisk1 -libgcc1 -liblzma5 -libmount1 -libpam0g -libpam-modules -libpam-modules-bin -libpam-runtime -libpcre3 -libselinux1 -libsepol1 -libsmartcols1 -libss2 -libtinfo5 -libuuid1 -login -lsb-base -mawk -mount -multiarch-support -ncurses-base -ncurses-bin -passwd -perl-base -sed -sensible-utils -sysvinit-utils -tar -tzdata -util-linux -zlib1g diff --git a/archived/ansible/files/apt-mark/hotkeys b/archived/ansible/files/apt-mark/hotkeys deleted file mode 100644 index f11bdfa..0000000 --- a/archived/ansible/files/apt-mark/hotkeys +++ /dev/null @@ -1 +0,0 @@ -acpid # captures hotkey presses and triggers respective /etc/acpi/events/* diff --git a/archived/ansible/files/apt-mark/man b/archived/ansible/files/apt-mark/man deleted file mode 100644 index f688e67..0000000 --- a/archived/ansible/files/apt-mark/man +++ /dev/null @@ -1,2 +0,0 @@ -man-db -manpages diff --git a/archived/ansible/files/apt-mark/minimal_ansible_environment b/archived/ansible/files/apt-mark/minimal_ansible_environment deleted file mode 100644 index f9f4097..0000000 --- a/archived/ansible/files/apt-mark/minimal_ansible_environment +++ /dev/null @@ -1,3 +0,0 @@ -ansible -ifupdown # needed for internet connectivity -isc-dhcp-client # needed for internet connectivity diff --git a/archived/ansible/files/apt-mark/minimal_x b/archived/ansible/files/apt-mark/minimal_x deleted file mode 100644 index f785794..0000000 --- a/archived/ansible/files/apt-mark/minimal_x +++ /dev/null @@ -1,4 +0,0 @@ -libpam-systemd # needed to start X as non-root -xinit # contains startx -xserver-xorg-core -xserver-xorg-input-evdev # supports all input devices the kernel knows about diff --git a/archived/ansible/files/apt-mark/multimedia b/archived/ansible/files/apt-mark/multimedia deleted file mode 100644 index 0b6d9ef..0000000 --- a/archived/ansible/files/apt-mark/multimedia +++ /dev/null @@ -1,6 +0,0 @@ -alsa-utils -eject -ffmpeg # somehow this is needed to make youtube-dl grab 1080p versions of videos -libdvd-pkg # decss stuff -mpv -youtube-dl # needed by mpv to directly work YouTube URLs diff --git a/archived/ansible/files/apt-mark/power_management b/archived/ansible/files/apt-mark/power_management deleted file mode 100644 index 3dba602..0000000 --- a/archived/ansible/files/apt-mark/power_management +++ /dev/null @@ -1,2 +0,0 @@ -acpi-call-dkms # needed for tlp to access Thinkpad-specific features -tlp diff --git a/archived/ansible/files/apt-mark/various_useful b/archived/ansible/files/apt-mark/various_useful deleted file mode 100644 index e37a898..0000000 --- a/archived/ansible/files/apt-mark/various_useful +++ /dev/null @@ -1,5 +0,0 @@ -git -less -openssh-client -sudo -vim diff --git a/archived/ansible/files/apt-mark/wifi b/archived/ansible/files/apt-mark/wifi deleted file mode 100644 index 0d9d93c..0000000 --- a/archived/ansible/files/apt-mark/wifi +++ /dev/null @@ -1,4 +0,0 @@ -firmware-iwlwifi # wifi driver -wicd-cli # thanks to my own wicd_wrapper.sh should be enough for most stuff -wicd-curses # although this currently is very buggy -wicd-gtk # workaround for when wicd-curses fails diff --git a/archived/ansible/files/apt-mark_new/W530/3d_acceleration b/archived/ansible/files/apt-mark_new/W530/3d_acceleration deleted file mode 100644 index 1b7e696..0000000 --- a/archived/ansible/files/apt-mark_new/W530/3d_acceleration +++ /dev/null @@ -1,3 +0,0 @@ -bumblebee-nvidia -linux-headers-amd64 # tested as necessary to build proper nvidia-driver module -primus # bridge by which bumblebee will deliver Nvidia-renderend content to Intel card diff --git a/archived/ansible/files/apt-mark_new/W530/browser_environment b/archived/ansible/files/apt-mark_new/W530/browser_environment deleted file mode 100644 index cc9575c..0000000 --- a/archived/ansible/files/apt-mark_new/W530/browser_environment +++ /dev/null @@ -1,4 +0,0 @@ -iceweasel -vim-gtk # used by pentadactyl for text editing -xul-ext-noscript -xul-ext-pentadactyl diff --git a/archived/ansible/files/apt-mark_new/W530/hotkeys b/archived/ansible/files/apt-mark_new/W530/hotkeys deleted file mode 100644 index f11bdfa..0000000 --- a/archived/ansible/files/apt-mark_new/W530/hotkeys +++ /dev/null @@ -1 +0,0 @@ -acpid # captures hotkey presses and triggers respective /etc/acpi/events/* diff --git a/archived/ansible/files/apt-mark_new/W530/multimedia b/archived/ansible/files/apt-mark_new/W530/multimedia deleted file mode 100644 index 219097d..0000000 --- a/archived/ansible/files/apt-mark_new/W530/multimedia +++ /dev/null @@ -1,3 +0,0 @@ -eject -ffmpeg # somehow this is needed to make youtube-dl grab 1080p versions of videos -libdvd-pkg # decss stuff diff --git a/archived/ansible/files/apt-mark_new/W530/wicd b/archived/ansible/files/apt-mark_new/W530/wicd deleted file mode 100644 index 55d86fe..0000000 --- a/archived/ansible/files/apt-mark_new/W530/wicd +++ /dev/null @@ -1,3 +0,0 @@ -wicd-cli # thanks to my own wicd_wrapper.sh should be enough for most stuff -wicd-curses # although this currently is very buggy -wicd-gtk # workaround for when wicd-curses fails diff --git a/archived/ansible/files/apt-mark_new/X200s/multimedia b/archived/ansible/files/apt-mark_new/X200s/multimedia deleted file mode 100644 index dbcf4ee..0000000 --- a/archived/ansible/files/apt-mark_new/X200s/multimedia +++ /dev/null @@ -1,4 +0,0 @@ -alsa-utils -ffmpeg # somehow this is needed to make youtube-dl grab 1080p versions of videos -mpv -youtube-dl # needed by mpv to directly work YouTube URLs diff --git a/archived/ansible/files/apt-mark_new/X200s/power_management b/archived/ansible/files/apt-mark_new/X200s/power_management deleted file mode 100644 index f6954bf..0000000 --- a/archived/ansible/files/apt-mark_new/X200s/power_management +++ /dev/null @@ -1,2 +0,0 @@ -tp-smapi-dkms -linux-headers-amd64 diff --git a/archived/ansible/files/apt-mark_new/X200s/wifi b/archived/ansible/files/apt-mark_new/X200s/wifi deleted file mode 100644 index a0e499d..0000000 --- a/archived/ansible/files/apt-mark_new/X200s/wifi +++ /dev/null @@ -1 +0,0 @@ -wpasupplicant diff --git a/archived/ansible/files/apt-mark_new/minimal/3d_acceleration b/archived/ansible/files/apt-mark_new/minimal/3d_acceleration deleted file mode 100644 index aa318bd..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/3d_acceleration +++ /dev/null @@ -1,2 +0,0 @@ -libglu1-mesa # tested as necessary for OpenGL 3D acceleration to work -libgl1-mesa-dri # tested as necessary for OpenGL 3D acceleration to work diff --git a/archived/ansible/files/apt-mark_new/minimal/basic_x_tools b/archived/ansible/files/apt-mark_new/minimal/basic_x_tools deleted file mode 100644 index 9c68622..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/basic_x_tools +++ /dev/null @@ -1,7 +0,0 @@ -i3 -i3status -python3 # this is what the i3status wrapper is written in -redshift -suckless-tools # contains dmenu; not using virtual packages as that won't be marked manually installed -xterm -x11-xserver-utils # includes xrdb which applies .Xresources files diff --git a/archived/ansible/files/apt-mark_new/minimal/browser_environment b/archived/ansible/files/apt-mark_new/minimal/browser_environment deleted file mode 100644 index 536ea49..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/browser_environment +++ /dev/null @@ -1 +0,0 @@ -palemoon diff --git a/archived/ansible/files/apt-mark_new/minimal/console b/archived/ansible/files/apt-mark_new/minimal/console deleted file mode 100644 index 01bcbf8..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/console +++ /dev/null @@ -1,2 +0,0 @@ -console-setup -locales diff --git a/archived/ansible/files/apt-mark_new/minimal/core b/archived/ansible/files/apt-mark_new/minimal/core deleted file mode 100644 index 43afba8..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/core +++ /dev/null @@ -1,55 +0,0 @@ -base-files -base-passwd -bash -bsdutils -coreutils -dash -debconf -debianutils -diffutils -dpkg -e2fslibs -e2fsprogs -findutils -gcc-6-base -grep -gzip -hostname -init-system-helpers -libacl1 -libattr1 -libblkid1 -libc6 -libc-bin -libcomerr2 -libfdisk1 -libgcc1 -liblzma5 -libmount1 -libpam0g -libpam-modules -libpam-modules-bin -libpam-runtime -libpcre3 -libselinux1 -libsepol1 -libsmartcols1 -libss2 -libtinfo5 -libuuid1 -login -lsb-base -mawk -mount -multiarch-support -ncurses-base -ncurses-bin -passwd -perl-base -sed -sensible-utils -sysvinit-utils -tar -tzdata -util-linux -zlib1g diff --git a/archived/ansible/files/apt-mark_new/minimal/disk_encryption b/archived/ansible/files/apt-mark_new/minimal/disk_encryption deleted file mode 100644 index 67ecd10..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/disk_encryption +++ /dev/null @@ -1,2 +0,0 @@ -cryptsetup -udev diff --git a/archived/ansible/files/apt-mark_new/minimal/man b/archived/ansible/files/apt-mark_new/minimal/man deleted file mode 100644 index f688e67..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/man +++ /dev/null @@ -1,2 +0,0 @@ -man-db -manpages diff --git a/archived/ansible/files/apt-mark_new/minimal/minimal_ansible_environment b/archived/ansible/files/apt-mark_new/minimal/minimal_ansible_environment deleted file mode 100644 index f9f4097..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/minimal_ansible_environment +++ /dev/null @@ -1,3 +0,0 @@ -ansible -ifupdown # needed for internet connectivity -isc-dhcp-client # needed for internet connectivity diff --git a/archived/ansible/files/apt-mark_new/minimal/minimal_x b/archived/ansible/files/apt-mark_new/minimal/minimal_x deleted file mode 100644 index f785794..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/minimal_x +++ /dev/null @@ -1,4 +0,0 @@ -libpam-systemd # needed to start X as non-root -xinit # contains startx -xserver-xorg-core -xserver-xorg-input-evdev # supports all input devices the kernel knows about diff --git a/archived/ansible/files/apt-mark_new/minimal/multimedia b/archived/ansible/files/apt-mark_new/minimal/multimedia deleted file mode 100644 index 0bcc060..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/multimedia +++ /dev/null @@ -1,3 +0,0 @@ -alsa-utils -mpv -youtube-dl # needed by mpv to directly work YouTube URLs diff --git a/archived/ansible/files/apt-mark_new/minimal/power_management b/archived/ansible/files/apt-mark_new/minimal/power_management deleted file mode 100644 index 3dba602..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/power_management +++ /dev/null @@ -1,2 +0,0 @@ -acpi-call-dkms # needed for tlp to access Thinkpad-specific features -tlp diff --git a/archived/ansible/files/apt-mark_new/minimal/various_useful b/archived/ansible/files/apt-mark_new/minimal/various_useful deleted file mode 100644 index e37a898..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/various_useful +++ /dev/null @@ -1,5 +0,0 @@ -git -less -openssh-client -sudo -vim diff --git a/archived/ansible/files/apt-mark_new/minimal/wifi b/archived/ansible/files/apt-mark_new/minimal/wifi deleted file mode 100644 index 4b8432d..0000000 --- a/archived/ansible/files/apt-mark_new/minimal/wifi +++ /dev/null @@ -1 +0,0 @@ -firmware-iwlwifi # wifi driver diff --git a/archived/ansible/files/console/___etc___default___console-setup b/archived/ansible/files/console/___etc___default___console-setup deleted file mode 100644 index 090d241..0000000 --- a/archived/ansible/files/console/___etc___default___console-setup +++ /dev/null @@ -1,4 +0,0 @@ -CHARMAP="UTF-8" -CODESET="Lat15" -FONTFACE="Terminus" -FONTSIZE="6x12" diff --git a/archived/ansible/files/console/___etc___default___keyboard b/archived/ansible/files/console/___etc___default___keyboard deleted file mode 100644 index 7f08e30..0000000 --- a/archived/ansible/files/console/___etc___default___keyboard +++ /dev/null @@ -1,4 +0,0 @@ -# setting XKBMODEL to the questionable default seems to be necessary and works nicely -# curiously, putting a comment on the same line as a variable setting seems to break things -XKBMODEL="pc105" -XKBLAYOUT="de" diff --git a/archived/ansible/files/dirs b/archived/ansible/files/dirs deleted file mode 100644 index 269b746..0000000 --- a/archived/ansible/files/dirs +++ /dev/null @@ -1,2 +0,0 @@ -/etc/wicd -/etc/acpi/events diff --git a/archived/ansible/files/dirs_new b/archived/ansible/files/dirs_new deleted file mode 100644 index 0739bb8..0000000 --- a/archived/ansible/files/dirs_new +++ /dev/null @@ -1 +0,0 @@ -/etc/wicd diff --git a/archived/ansible/files/system/___etc___X11___xorg.conf.forced_nvidia b/archived/ansible/files/system/___etc___X11___xorg.conf.forced_nvidia deleted file mode 100644 index 605a10d..0000000 --- a/archived/ansible/files/system/___etc___X11___xorg.conf.forced_nvidia +++ /dev/null @@ -1,34 +0,0 @@ -# This is the Optimus-specific configuration recommended by the "NVIDIA -# Accelerated Linux Graphics Drivre README and Installation Guide", Chapter 32 -# "Offloading Graphics Display with RandR 1.4" -# () -# with the "AllowEmptyInitialConfigratuion" added as described by -# . - -Section "ServerLayout" - Identifier "layout" - Screen 0 "nvidia" - Inactive "intel" -EndSection - -Section "Device" - Identifier "nvidia" - Driver "nvidia" - BusID "PCI:01:00:0" - Option "AllowEmptyInitialConfiguration" -EndSection - -Section "Screen" - Identifier "nvidia" - Device "nvidia" -EndSection - -Section "Device" - Identifier "intel" - Driver "modesetting" -EndSection - -Section "Screen" - Identifier "intel" - Device "intel" -EndSection diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-brightness-down b/archived/ansible/files/system/___etc___acpi___events___plom-brightness-down deleted file mode 100644 index 8d718d2..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-brightness-down +++ /dev/null @@ -1,2 +0,0 @@ -event=video/brightnessdown -action=/root/config/bin/w530_backlight.sh - diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-brightness-up b/archived/ansible/files/system/___etc___acpi___events___plom-brightness-up deleted file mode 100644 index 864ce5f..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-brightness-up +++ /dev/null @@ -1,2 +0,0 @@ -event=video/brightnessup -action=/root/config/bin/w530_backlight.sh + diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-micmute b/archived/ansible/files/system/___etc___acpi___events___plom-micmute deleted file mode 100644 index 2aab48e..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-micmute +++ /dev/null @@ -1,2 +0,0 @@ -event=button/f20 -action=amixer set Mic toggle diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-mute b/archived/ansible/files/system/___etc___acpi___events___plom-mute deleted file mode 100644 index 3c40988..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-mute +++ /dev/null @@ -1,2 +0,0 @@ -event=button/mute -action=amixer set Master toggle diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-volume-down b/archived/ansible/files/system/___etc___acpi___events___plom-volume-down deleted file mode 100644 index 7658b1c..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-volume-down +++ /dev/null @@ -1,2 +0,0 @@ -event=button/volumedown -action=amixer set Master 10- diff --git a/archived/ansible/files/system/___etc___acpi___events___plom-volume-up b/archived/ansible/files/system/___etc___acpi___events___plom-volume-up deleted file mode 100644 index 9ba779f..0000000 --- a/archived/ansible/files/system/___etc___acpi___events___plom-volume-up +++ /dev/null @@ -1,2 +0,0 @@ -event=button/volumeup -action=amixer set Master 10+ diff --git a/archived/ansible/files/system/___etc___apt___apt.conf.d___99mindeps b/archived/ansible/files/system/___etc___apt___apt.conf.d___99mindeps deleted file mode 100644 index 4aaef79..0000000 --- a/archived/ansible/files/system/___etc___apt___apt.conf.d___99mindeps +++ /dev/null @@ -1,4 +0,0 @@ -APT::AutoRemove::RecommendsImportant "false"; -APT::AutoRemove::SuggestsImportant "false"; -APT::Install-Recommends "false"; -APT::Install-Suggests "false"; diff --git a/archived/ansible/files/system/___etc___apt___sources.list b/archived/ansible/files/system/___etc___apt___sources.list deleted file mode 100644 index e64d6ee..0000000 --- a/archived/ansible/files/system/___etc___apt___sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://ftp.debian.org/debian/ stretch main contrib non-free -deb http://ftp.debian.org/debian/ stretch-updates main contrib non-free -deb http://ftp.debian.org/debian stretch-backports main contrib non-free -deb http://security.debian.org/ stretch/updates main contrib non-free diff --git a/archived/ansible/files/system/___etc___default___tlp b/archived/ansible/files/system/___etc___default___tlp deleted file mode 100644 index 6db0f60..0000000 --- a/archived/ansible/files/system/___etc___default___tlp +++ /dev/null @@ -1,278 +0,0 @@ -# ------------------------------------------------------------------------------ -# tlp - Parameters for power save -# See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html - -# Hint: some features are disabled by default, remove the leading # to enable -# them. - -# Set to 0 to disable, 1 to enable TLP. -TLP_ENABLE=1 - -# Operation mode when no power supply can be detected: AC, BAT -# Concerns some desktop and embedded hardware only. -TLP_DEFAULT_MODE=AC - -# Seconds laptop mode has to wait after the disk goes idle before doing a sync. -# Non-zero value enables, zero disables laptop mode. -DISK_IDLE_SECS_ON_AC=0 -DISK_IDLE_SECS_ON_BAT=2 - -# Dirty page values (timeouts in secs). -MAX_LOST_WORK_SECS_ON_AC=15 -MAX_LOST_WORK_SECS_ON_BAT=60 - -# Hint: CPU parameters below are disabled by default, remove the leading # -# to enable them, otherwise kernel default values are used. - -# Select a CPU frequency scaling governor. -# Intel Core i processor with intel_pstate driver: -# powersave(*), performance -# Older hardware with acpi-cpufreq driver: -# ondemand(*), powersave, performance, conservative -# (*) is recommended. -# Hint: use tlp-stat -p to show the active driver and available governors. -# Important: -# You *must* disable your distribution's governor settings or conflicts will -# occur. ondemand is sufficient for *almost all* workloads, you should know -# what you're doing! -#CPU_SCALING_GOVERNOR_ON_AC=powersave -#CPU_SCALING_GOVERNOR_ON_BAT=powersave - -# Set the min/max frequency available for the scaling governor. -# Possible values strongly depend on your CPU. For available frequencies see -# the output of tlp-stat -p. -#CPU_SCALING_MIN_FREQ_ON_AC=0 -#CPU_SCALING_MAX_FREQ_ON_AC=0 -#CPU_SCALING_MIN_FREQ_ON_BAT=0 -#CPU_SCALING_MAX_FREQ_ON_BAT=0 - -# Set Intel P-state performance: 0..100 (%) -# Limit the max/min P-state to control the power dissipation of the CPU. -# Values are stated as a percentage of the available performance. -# Requires an Intel Core i processor with intel_pstate driver. -#CPU_MIN_PERF_ON_AC=0 -#CPU_MAX_PERF_ON_AC=100 -#CPU_MIN_PERF_ON_BAT=0 -#CPU_MAX_PERF_ON_BAT=30 - -# Set the CPU "turbo boost" feature: 0=disable, 1=allow -# Requires an Intel Core i processor. -# Important: -# - This may conflict with your distribution's governor settings -# - A value of 1 does *not* activate boosting, it just allows it -#CPU_BOOST_ON_AC=1 -#CPU_BOOST_ON_BAT=0 - -# Minimize number of used CPU cores/hyper-threads under light load conditions -SCHED_POWERSAVE_ON_AC=0 -SCHED_POWERSAVE_ON_BAT=1 - -# Kernel NMI Watchdog: -# 0=disable (default, saves power), 1=enable (for kernel debugging only) -NMI_WATCHDOG=0 - -# Change CPU voltages aka "undervolting" - Kernel with PHC patch required -# Frequency voltage pairs are written to: -# /sys/devices/system/cpu/cpu0/cpufreq/phc_controls -# CAUTION: only use this, if you thoroughly understand what you are doing! -#PHC_CONTROLS="F:V F:V F:V F:V" - -# Set CPU performance versus energy savings policy: -# performance, normal, powersave -# Requires kernel module msr and x86_energy_perf_policy from linux-tools -ENERGY_PERF_POLICY_ON_AC=performance -ENERGY_PERF_POLICY_ON_BAT=powersave - -# Hard disk devices; separate multiple devices with spaces (default: sda). -# Devices can be specified by disk ID also (lookup with: tlp diskid). -DISK_DEVICES="sda sdb" - -# Hard disk advanced power management level: 1..254, 255 (max saving, min, off) -# Levels 1..127 may spin down the disk; 255 allowable on most drives. -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the hardware default for the particular disk. -DISK_APM_LEVEL_ON_AC="254 254" -DISK_APM_LEVEL_ON_BAT="128 128" - -# Hard disk spin down timeout: -# 0: spin down disabled -# 1..240: timeouts from 5s to 20min (in units of 5s) -# 241..251: timeouts from 30min to 5.5 hours (in units of 30min) -# See 'man hdparm' for details. -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the hardware default for the particular disk. -#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0" -#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0" - -# Select IO scheduler for the disk devices: cfq, deadline, noop (Default: cfq); -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the kernel default scheduler for the particular disk. -#DISK_IOSCHED="cfq cfq" - -# SATA aggressive link power management (ALPM): -# min_power, medium_power, max_performance -SATA_LINKPWR_ON_AC=max_performance -SATA_LINKPWR_ON_BAT=min_power - -# Exclude SATA host devices from link power management. -# Separate multiple hosts with spaces. -#SATA_LINKPWR_BLACKLIST="host1" - -# Runtime Power Management for AHCI controllers and disks: -# on=disable, auto=enable -# EXPERIMENTAL ** WARNING: auto will most likely cause system lockups/data loss -#AHCI_RUNTIME_PM_ON_AC=on -#AHCI_RUNTIME_PM_ON_BAT=on - -# Seconds of inactivity before disk is suspended -AHCI_RUNTIME_PM_TIMEOUT=15 - -# PCI Express Active State Power Management (PCIe ASPM): -# default, performance, powersave -PCIE_ASPM_ON_AC=performance -PCIE_ASPM_ON_BAT=powersave - -# Radeon graphics clock speed (profile method): low, mid, high, auto, default; -# auto = mid on BAT, high on AC; default = use hardware defaults. -# (Kernel >= 2.6.35 only, open-source radeon driver explicitly) -RADEON_POWER_PROFILE_ON_AC=high -RADEON_POWER_PROFILE_ON_BAT=low - -# Radeon dynamic power management method (DPM): battery, performance -# (Kernel >= 3.11 only, requires boot option radeon.dpm=1) -RADEON_DPM_STATE_ON_AC=performance -RADEON_DPM_STATE_ON_BAT=battery - -# Radeon DPM performance level: auto, low, high; auto is recommended. -RADEON_DPM_PERF_LEVEL_ON_AC=auto -RADEON_DPM_PERF_LEVEL_ON_BAT=auto - -# WiFi power saving mode: on=enable, off=disable; not supported by all adapters. -WIFI_PWR_ON_AC=off -WIFI_PWR_ON_BAT=on - -# Disable wake on LAN: Y/N -WOL_DISABLE=Y - -# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs). -# A value of 0 disables, >=1 enables power save. -SOUND_POWER_SAVE_ON_AC=0 -SOUND_POWER_SAVE_ON_BAT=1 - -# Disable controller too (HDA only): Y/N -SOUND_POWER_SAVE_CONTROLLER=Y - -# Set to 1 to power off optical drive in UltraBay/MediaBay when running on -# battery. A value of 0 disables this feature (Default). -# Drive can be powered on again by releasing (and reinserting) the eject lever -# or by pressing the disc eject button on newer models. -# Note: an UltraBay/MediaBay hard disk is never powered off. -BAY_POWEROFF_ON_BAT=0 -# Optical drive device to power off (default sr0). -BAY_DEVICE="sr0" - -# Runtime Power Management for PCI(e) bus devices: on=disable, auto=enable -RUNTIME_PM_ON_AC=on -RUNTIME_PM_ON_BAT=auto - -# Runtime PM for *all* PCI(e) bus devices, except blacklisted ones: -# 0=disable, 1=enable -RUNTIME_PM_ALL=1 - -# Exclude PCI(e) device adresses the following list from Runtime PM -# (separate with spaces). Use lspci to get the adresses (1st column). -#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6" - -# Exclude PCI(e) devices assigned to the listed drivers from Runtime PM -# (should prevent accidential power on of hybrid graphics' discrete part). -# Default is "radeon nouveau"; use "" to disable the feature completely. -# Separate multiple drivers with spaces. -RUNTIME_PM_DRIVER_BLACKLIST="radeon nouveau" - -# Set to 0 to disable, 1 to enable USB autosuspend feature. -USB_AUTOSUSPEND=1 - -# Exclude listed devices from USB autosuspend (separate with spaces). -# Use lsusb to get the ids. -# Note: input devices (usbhid) are excluded automatically (see below) -#USB_BLACKLIST="1111:2222 3333:4444" - -# WWAN devices are excluded from USB autosuspend: 0=do not exclude / 1=exclude -USB_BLACKLIST_WWAN=1 - -# Include listed devices into USB autosuspend even if already excluded -# by the driver or WWAN blacklists above (separate with spaces). -# Use lsusb to get the ids. -#USB_WHITELIST="1111:2222 3333:4444" - -# Set to 1 to disable autosuspend before shutdown, 0 to do nothing -# (workaround for USB devices that cause shutdown problems). -#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1 - -# Restore radio device state (Bluetooth, WiFi, WWAN) from previous shutdown -# on system startup: 0=disable, 1=enable. -# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below -# are ignored when this is enabled! -RESTORE_DEVICE_STATE_ON_STARTUP=0 - -# Radio devices to disable on startup: bluetooth, wifi, wwan. -# Separate multiple devices with spaces. -DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan" - -# Radio devices to enable on startup: bluetooth, wifi, wwan. -# Separate multiple devices with spaces. -#DEVICES_TO_ENABLE_ON_STARTUP="wifi" - -# Radio devices to disable on shutdown: bluetooth, wifi, wwan -# (workaround for devices that are blocking shutdown). -#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan" - -# Radio devices to enable on shutdown: bluetooth, wifi, wwan -# (to prevent other operating systems from missing radios). -#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan" - -# Radio devices to enable on AC: bluetooth, wifi, wwan -#DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan" - -# Radio devices to disable on battery: bluetooth, wifi, wwan -#DEVICES_TO_DISABLE_ON_BAT="bluetooth wifi wwan" - -# Radio devices to disable on battery when not in use (not connected): -# bluetooth, wifi, wwan -DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wifi wwan" - -# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module -# required). Charging starts when the remaining capacity falls below the -# START_CHARGE_THRESH value and stops when exceeding the STOP_CHARGE_THRESH value. -# Main / Internal battery (values in %) -START_CHARGE_THRESH_BAT0=10 -STOP_CHARGE_THRESH_BAT0=95 -# Ultrabay / Slice / Replaceable battery (values in %) -START_CHARGE_THRESH_BAT1=10 -STOP_CHARGE_THRESH_BAT1=95 - -# ------------------------------------------------------------------------------ -# tlp-rdw - Parameters for the radio device wizard -# Possible devices: bluetooth, wifi, wwan - -# Hints: -# - Parameters are disabled by default, remove the leading # to enable them. -# - Separate multiple radio devices with spaces. - -# Radio devices to disable on connect. -#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan" -#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan" -#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi" - -# Radio devices to enable on disconnect. -#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan" -#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT="" -#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT="" - -# Radio devices to enable/disable when docked. -#DEVICES_TO_ENABLE_ON_DOCK="" -#DEVICES_TO_DISABLE_ON_DOCK="" - -# Radio devices to enable/disable when undocked. -#DEVICES_TO_ENABLE_ON_UNDOCK="wifi" -#DEVICES_TO_DISABLE_ON_UNDOCK="" diff --git a/archived/ansible/files/system/___etc___hostname b/archived/ansible/files/system/___etc___hostname deleted file mode 100644 index 8769fca..0000000 --- a/archived/ansible/files/system/___etc___hostname +++ /dev/null @@ -1 +0,0 @@ -w530 diff --git a/archived/ansible/files/system/___etc___hosts b/archived/ansible/files/system/___etc___hosts deleted file mode 100644 index d920e4f..0000000 --- a/archived/ansible/files/system/___etc___hosts +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost -127.0.1.1 w530 - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters diff --git a/archived/ansible/files/system/___etc___profile b/archived/ansible/files/system/___etc___profile deleted file mode 100644 index 5884d7b..0000000 --- a/archived/ansible/files/system/___etc___profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -if [ "`id -u`" -eq 0 ]; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -else - PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" -fi -export PATH - -if [ "${PS1-}" ]; then - if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then - # The file bash.bashrc already sets the default PS1. - # PS1='\h:\w\$ ' - if [ -f /etc/bash.bashrc ]; then - . /etc/bash.bashrc - fi - else - if [ "`id -u`" -eq 0 ]; then - PS1='# ' - else - PS1='$ ' - fi - fi -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi -export LC_ALL="en_US.UTF-8" diff --git a/archived/ansible/files/system/___etc___systemd___logind.conf b/archived/ansible/files/system/___etc___systemd___logind.conf deleted file mode 100644 index 7a9004a..0000000 --- a/archived/ansible/files/system/___etc___systemd___logind.conf +++ /dev/null @@ -1,38 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Entries in this file show the compile time defaults. -# You can change settings by editing this file. -# Defaults can be restored by simply deleting this file. -# -# See logind.conf(5) for details. - -[Login] -#NAutoVTs=6 -#ReserveVT=6 -#KillUserProcesses=no -#KillOnlyUsers= -#KillExcludeUsers=root -#InhibitDelayMaxSec=5 -#HandlePowerKey=poweroff -#HandleSuspendKey=suspend -#HandleHibernateKey=hibernate -#HandleLidSwitch=suspend -#HandleLidSwitchDocked=ignore -#PowerKeyIgnoreInhibited=no -#SuspendKeyIgnoreInhibited=no -#HibernateKeyIgnoreInhibited=no -#LidSwitchIgnoreInhibited=yes -#HoldoffTimeoutSec=30s -#IdleAction=ignore -#IdleActionSec=30min -#RuntimeDirectorySize=10% -#RemoveIPC=yes -#InhibitorsMax=8192 -#SessionsMax=8192 -#UserTasksMax=33% -HandleLidSwitch=hibernate diff --git a/archived/ansible/files/system/___etc___timezone b/archived/ansible/files/system/___etc___timezone deleted file mode 100644 index 94d5acc..0000000 --- a/archived/ansible/files/system/___etc___timezone +++ /dev/null @@ -1 +0,0 @@ -Europe/Berlin diff --git a/archived/ansible/files/system/___etc___wicd___manager-settings.conf b/archived/ansible/files/system/___etc___wicd___manager-settings.conf deleted file mode 100644 index d2ef3ee..0000000 --- a/archived/ansible/files/system/___etc___wicd___manager-settings.conf +++ /dev/null @@ -1,24 +0,0 @@ -[Settings] -backend = external -wireless_interface = wlp3s0 -wired_interface = enp0s25 -wpa_driver = wext -always_show_wired_interface = False -use_global_dns = False -global_dns_1 = None -global_dns_2 = None -global_dns_3 = None -global_dns_dom = None -global_search_dom = None -auto_reconnect = True -debug_mode = False -wired_connect_mode = 1 -signal_display_type = 0 -should_verify_ap = 1 -dhcp_client = 0 -link_detect_tool = 0 -flush_tool = 0 -sudo_app = 0 -prefer_wired = False -show_never_connect = True - diff --git a/archived/ansible/files/system_new/W530/___etc___X11___xorg.conf.forced_nvidia b/archived/ansible/files/system_new/W530/___etc___X11___xorg.conf.forced_nvidia deleted file mode 100644 index e651031..0000000 --- a/archived/ansible/files/system_new/W530/___etc___X11___xorg.conf.forced_nvidia +++ /dev/null @@ -1,34 +0,0 @@ -# This is the Optimus-specific configuration recommended by the "NVIDIA -# Accelerated Linux Graphics Driver README and Installation Guide", Chapter 32 -# "Offloading Graphics Display with RandR 1.4" -# () -# with the "AllowEmptyInitialConfigratuion" added as described by -# . - -Section "ServerLayout" - Identifier "layout" - Screen 0 "nvidia" - Inactive "intel" -EndSection - -Section "Device" - Identifier "nvidia" - Driver "nvidia" - BusID "PCI:01:00:0" - Option "AllowEmptyInitialConfiguration" -EndSection - -Section "Screen" - Identifier "nvidia" - Device "nvidia" -EndSection - -Section "Device" - Identifier "intel" - Driver "modesetting" -EndSection - -Section "Screen" - Identifier "intel" - Device "intel" -EndSection diff --git a/archived/ansible/files/system_new/W530/___etc___hostname b/archived/ansible/files/system_new/W530/___etc___hostname deleted file mode 100644 index 4d385ae..0000000 --- a/archived/ansible/files/system_new/W530/___etc___hostname +++ /dev/null @@ -1 +0,0 @@ -W530 diff --git a/archived/ansible/files/system_new/W530/___etc___hosts b/archived/ansible/files/system_new/W530/___etc___hosts deleted file mode 100644 index c6f72a5..0000000 --- a/archived/ansible/files/system_new/W530/___etc___hosts +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost -127.0.1.1 W530 - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters diff --git a/archived/ansible/files/system_new/W530/___etc___wicd___manager-settings.conf b/archived/ansible/files/system_new/W530/___etc___wicd___manager-settings.conf deleted file mode 100644 index d2ef3ee..0000000 --- a/archived/ansible/files/system_new/W530/___etc___wicd___manager-settings.conf +++ /dev/null @@ -1,24 +0,0 @@ -[Settings] -backend = external -wireless_interface = wlp3s0 -wired_interface = enp0s25 -wpa_driver = wext -always_show_wired_interface = False -use_global_dns = False -global_dns_1 = None -global_dns_2 = None -global_dns_3 = None -global_dns_dom = None -global_search_dom = None -auto_reconnect = True -debug_mode = False -wired_connect_mode = 1 -signal_display_type = 0 -should_verify_ap = 1 -dhcp_client = 0 -link_detect_tool = 0 -flush_tool = 0 -sudo_app = 0 -prefer_wired = False -show_never_connect = True - diff --git a/archived/ansible/files/system_new/X200s/___etc___hostname b/archived/ansible/files/system_new/X200s/___etc___hostname deleted file mode 100644 index d241415..0000000 --- a/archived/ansible/files/system_new/X200s/___etc___hostname +++ /dev/null @@ -1 +0,0 @@ -X200s diff --git a/archived/ansible/files/system_new/X200s/___etc___hosts b/archived/ansible/files/system_new/X200s/___etc___hosts deleted file mode 100644 index b275ecb..0000000 --- a/archived/ansible/files/system_new/X200s/___etc___hosts +++ /dev/null @@ -1,7 +0,0 @@ -127.0.0.1 localhost -127.0.1.1 X200s - -# The following lines are desirable for IPv6 capable hosts -::1 localhost ip6-localhost ip6-loopback -ff02::1 ip6-allnodes -ff02::2 ip6-allrouters diff --git a/archived/ansible/files/system_new/minimal/___etc___apt___apt.conf.d___99mindeps b/archived/ansible/files/system_new/minimal/___etc___apt___apt.conf.d___99mindeps deleted file mode 100644 index 4aaef79..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___apt___apt.conf.d___99mindeps +++ /dev/null @@ -1,4 +0,0 @@ -APT::AutoRemove::RecommendsImportant "false"; -APT::AutoRemove::SuggestsImportant "false"; -APT::Install-Recommends "false"; -APT::Install-Suggests "false"; diff --git a/archived/ansible/files/system_new/minimal/___etc___apt___sources.list b/archived/ansible/files/system_new/minimal/___etc___apt___sources.list deleted file mode 100644 index e64d6ee..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___apt___sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://ftp.debian.org/debian/ stretch main contrib non-free -deb http://ftp.debian.org/debian/ stretch-updates main contrib non-free -deb http://ftp.debian.org/debian stretch-backports main contrib non-free -deb http://security.debian.org/ stretch/updates main contrib non-free diff --git a/archived/ansible/files/system_new/minimal/___etc___apt___sources.list.d___palemoon.list b/archived/ansible/files/system_new/minimal/___etc___apt___sources.list.d___palemoon.list deleted file mode 100644 index f90488e..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___apt___sources.list.d___palemoon.list +++ /dev/null @@ -1 +0,0 @@ -deb http://download.opensuse.org/repositories/home:/stevenpusser/Debian_9.0/ / diff --git a/archived/ansible/files/system_new/minimal/___etc___default___tlp b/archived/ansible/files/system_new/minimal/___etc___default___tlp deleted file mode 100644 index 6db0f60..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___default___tlp +++ /dev/null @@ -1,278 +0,0 @@ -# ------------------------------------------------------------------------------ -# tlp - Parameters for power save -# See full explanation: http://linrunner.de/en/tlp/docs/tlp-configuration.html - -# Hint: some features are disabled by default, remove the leading # to enable -# them. - -# Set to 0 to disable, 1 to enable TLP. -TLP_ENABLE=1 - -# Operation mode when no power supply can be detected: AC, BAT -# Concerns some desktop and embedded hardware only. -TLP_DEFAULT_MODE=AC - -# Seconds laptop mode has to wait after the disk goes idle before doing a sync. -# Non-zero value enables, zero disables laptop mode. -DISK_IDLE_SECS_ON_AC=0 -DISK_IDLE_SECS_ON_BAT=2 - -# Dirty page values (timeouts in secs). -MAX_LOST_WORK_SECS_ON_AC=15 -MAX_LOST_WORK_SECS_ON_BAT=60 - -# Hint: CPU parameters below are disabled by default, remove the leading # -# to enable them, otherwise kernel default values are used. - -# Select a CPU frequency scaling governor. -# Intel Core i processor with intel_pstate driver: -# powersave(*), performance -# Older hardware with acpi-cpufreq driver: -# ondemand(*), powersave, performance, conservative -# (*) is recommended. -# Hint: use tlp-stat -p to show the active driver and available governors. -# Important: -# You *must* disable your distribution's governor settings or conflicts will -# occur. ondemand is sufficient for *almost all* workloads, you should know -# what you're doing! -#CPU_SCALING_GOVERNOR_ON_AC=powersave -#CPU_SCALING_GOVERNOR_ON_BAT=powersave - -# Set the min/max frequency available for the scaling governor. -# Possible values strongly depend on your CPU. For available frequencies see -# the output of tlp-stat -p. -#CPU_SCALING_MIN_FREQ_ON_AC=0 -#CPU_SCALING_MAX_FREQ_ON_AC=0 -#CPU_SCALING_MIN_FREQ_ON_BAT=0 -#CPU_SCALING_MAX_FREQ_ON_BAT=0 - -# Set Intel P-state performance: 0..100 (%) -# Limit the max/min P-state to control the power dissipation of the CPU. -# Values are stated as a percentage of the available performance. -# Requires an Intel Core i processor with intel_pstate driver. -#CPU_MIN_PERF_ON_AC=0 -#CPU_MAX_PERF_ON_AC=100 -#CPU_MIN_PERF_ON_BAT=0 -#CPU_MAX_PERF_ON_BAT=30 - -# Set the CPU "turbo boost" feature: 0=disable, 1=allow -# Requires an Intel Core i processor. -# Important: -# - This may conflict with your distribution's governor settings -# - A value of 1 does *not* activate boosting, it just allows it -#CPU_BOOST_ON_AC=1 -#CPU_BOOST_ON_BAT=0 - -# Minimize number of used CPU cores/hyper-threads under light load conditions -SCHED_POWERSAVE_ON_AC=0 -SCHED_POWERSAVE_ON_BAT=1 - -# Kernel NMI Watchdog: -# 0=disable (default, saves power), 1=enable (for kernel debugging only) -NMI_WATCHDOG=0 - -# Change CPU voltages aka "undervolting" - Kernel with PHC patch required -# Frequency voltage pairs are written to: -# /sys/devices/system/cpu/cpu0/cpufreq/phc_controls -# CAUTION: only use this, if you thoroughly understand what you are doing! -#PHC_CONTROLS="F:V F:V F:V F:V" - -# Set CPU performance versus energy savings policy: -# performance, normal, powersave -# Requires kernel module msr and x86_energy_perf_policy from linux-tools -ENERGY_PERF_POLICY_ON_AC=performance -ENERGY_PERF_POLICY_ON_BAT=powersave - -# Hard disk devices; separate multiple devices with spaces (default: sda). -# Devices can be specified by disk ID also (lookup with: tlp diskid). -DISK_DEVICES="sda sdb" - -# Hard disk advanced power management level: 1..254, 255 (max saving, min, off) -# Levels 1..127 may spin down the disk; 255 allowable on most drives. -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the hardware default for the particular disk. -DISK_APM_LEVEL_ON_AC="254 254" -DISK_APM_LEVEL_ON_BAT="128 128" - -# Hard disk spin down timeout: -# 0: spin down disabled -# 1..240: timeouts from 5s to 20min (in units of 5s) -# 241..251: timeouts from 30min to 5.5 hours (in units of 30min) -# See 'man hdparm' for details. -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the hardware default for the particular disk. -#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0" -#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0" - -# Select IO scheduler for the disk devices: cfq, deadline, noop (Default: cfq); -# Separate values for multiple disks with spaces. Use the special value 'keep' -# to keep the kernel default scheduler for the particular disk. -#DISK_IOSCHED="cfq cfq" - -# SATA aggressive link power management (ALPM): -# min_power, medium_power, max_performance -SATA_LINKPWR_ON_AC=max_performance -SATA_LINKPWR_ON_BAT=min_power - -# Exclude SATA host devices from link power management. -# Separate multiple hosts with spaces. -#SATA_LINKPWR_BLACKLIST="host1" - -# Runtime Power Management for AHCI controllers and disks: -# on=disable, auto=enable -# EXPERIMENTAL ** WARNING: auto will most likely cause system lockups/data loss -#AHCI_RUNTIME_PM_ON_AC=on -#AHCI_RUNTIME_PM_ON_BAT=on - -# Seconds of inactivity before disk is suspended -AHCI_RUNTIME_PM_TIMEOUT=15 - -# PCI Express Active State Power Management (PCIe ASPM): -# default, performance, powersave -PCIE_ASPM_ON_AC=performance -PCIE_ASPM_ON_BAT=powersave - -# Radeon graphics clock speed (profile method): low, mid, high, auto, default; -# auto = mid on BAT, high on AC; default = use hardware defaults. -# (Kernel >= 2.6.35 only, open-source radeon driver explicitly) -RADEON_POWER_PROFILE_ON_AC=high -RADEON_POWER_PROFILE_ON_BAT=low - -# Radeon dynamic power management method (DPM): battery, performance -# (Kernel >= 3.11 only, requires boot option radeon.dpm=1) -RADEON_DPM_STATE_ON_AC=performance -RADEON_DPM_STATE_ON_BAT=battery - -# Radeon DPM performance level: auto, low, high; auto is recommended. -RADEON_DPM_PERF_LEVEL_ON_AC=auto -RADEON_DPM_PERF_LEVEL_ON_BAT=auto - -# WiFi power saving mode: on=enable, off=disable; not supported by all adapters. -WIFI_PWR_ON_AC=off -WIFI_PWR_ON_BAT=on - -# Disable wake on LAN: Y/N -WOL_DISABLE=Y - -# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs). -# A value of 0 disables, >=1 enables power save. -SOUND_POWER_SAVE_ON_AC=0 -SOUND_POWER_SAVE_ON_BAT=1 - -# Disable controller too (HDA only): Y/N -SOUND_POWER_SAVE_CONTROLLER=Y - -# Set to 1 to power off optical drive in UltraBay/MediaBay when running on -# battery. A value of 0 disables this feature (Default). -# Drive can be powered on again by releasing (and reinserting) the eject lever -# or by pressing the disc eject button on newer models. -# Note: an UltraBay/MediaBay hard disk is never powered off. -BAY_POWEROFF_ON_BAT=0 -# Optical drive device to power off (default sr0). -BAY_DEVICE="sr0" - -# Runtime Power Management for PCI(e) bus devices: on=disable, auto=enable -RUNTIME_PM_ON_AC=on -RUNTIME_PM_ON_BAT=auto - -# Runtime PM for *all* PCI(e) bus devices, except blacklisted ones: -# 0=disable, 1=enable -RUNTIME_PM_ALL=1 - -# Exclude PCI(e) device adresses the following list from Runtime PM -# (separate with spaces). Use lspci to get the adresses (1st column). -#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6" - -# Exclude PCI(e) devices assigned to the listed drivers from Runtime PM -# (should prevent accidential power on of hybrid graphics' discrete part). -# Default is "radeon nouveau"; use "" to disable the feature completely. -# Separate multiple drivers with spaces. -RUNTIME_PM_DRIVER_BLACKLIST="radeon nouveau" - -# Set to 0 to disable, 1 to enable USB autosuspend feature. -USB_AUTOSUSPEND=1 - -# Exclude listed devices from USB autosuspend (separate with spaces). -# Use lsusb to get the ids. -# Note: input devices (usbhid) are excluded automatically (see below) -#USB_BLACKLIST="1111:2222 3333:4444" - -# WWAN devices are excluded from USB autosuspend: 0=do not exclude / 1=exclude -USB_BLACKLIST_WWAN=1 - -# Include listed devices into USB autosuspend even if already excluded -# by the driver or WWAN blacklists above (separate with spaces). -# Use lsusb to get the ids. -#USB_WHITELIST="1111:2222 3333:4444" - -# Set to 1 to disable autosuspend before shutdown, 0 to do nothing -# (workaround for USB devices that cause shutdown problems). -#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1 - -# Restore radio device state (Bluetooth, WiFi, WWAN) from previous shutdown -# on system startup: 0=disable, 1=enable. -# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below -# are ignored when this is enabled! -RESTORE_DEVICE_STATE_ON_STARTUP=0 - -# Radio devices to disable on startup: bluetooth, wifi, wwan. -# Separate multiple devices with spaces. -DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan" - -# Radio devices to enable on startup: bluetooth, wifi, wwan. -# Separate multiple devices with spaces. -#DEVICES_TO_ENABLE_ON_STARTUP="wifi" - -# Radio devices to disable on shutdown: bluetooth, wifi, wwan -# (workaround for devices that are blocking shutdown). -#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan" - -# Radio devices to enable on shutdown: bluetooth, wifi, wwan -# (to prevent other operating systems from missing radios). -#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan" - -# Radio devices to enable on AC: bluetooth, wifi, wwan -#DEVICES_TO_ENABLE_ON_AC="bluetooth wifi wwan" - -# Radio devices to disable on battery: bluetooth, wifi, wwan -#DEVICES_TO_DISABLE_ON_BAT="bluetooth wifi wwan" - -# Radio devices to disable on battery when not in use (not connected): -# bluetooth, wifi, wwan -DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wifi wwan" - -# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module -# required). Charging starts when the remaining capacity falls below the -# START_CHARGE_THRESH value and stops when exceeding the STOP_CHARGE_THRESH value. -# Main / Internal battery (values in %) -START_CHARGE_THRESH_BAT0=10 -STOP_CHARGE_THRESH_BAT0=95 -# Ultrabay / Slice / Replaceable battery (values in %) -START_CHARGE_THRESH_BAT1=10 -STOP_CHARGE_THRESH_BAT1=95 - -# ------------------------------------------------------------------------------ -# tlp-rdw - Parameters for the radio device wizard -# Possible devices: bluetooth, wifi, wwan - -# Hints: -# - Parameters are disabled by default, remove the leading # to enable them. -# - Separate multiple radio devices with spaces. - -# Radio devices to disable on connect. -#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan" -#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan" -#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi" - -# Radio devices to enable on disconnect. -#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan" -#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT="" -#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT="" - -# Radio devices to enable/disable when docked. -#DEVICES_TO_ENABLE_ON_DOCK="" -#DEVICES_TO_DISABLE_ON_DOCK="" - -# Radio devices to enable/disable when undocked. -#DEVICES_TO_ENABLE_ON_UNDOCK="wifi" -#DEVICES_TO_DISABLE_ON_UNDOCK="" diff --git a/archived/ansible/files/system_new/minimal/___etc___profile b/archived/ansible/files/system_new/minimal/___etc___profile deleted file mode 100644 index 5884d7b..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___profile +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/profile: system-wide .profile file for the Bourne shell (sh(1)) -# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). - -if [ "`id -u`" -eq 0 ]; then - PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" -else - PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" -fi -export PATH - -if [ "${PS1-}" ]; then - if [ "${BASH-}" ] && [ "$BASH" != "/bin/sh" ]; then - # The file bash.bashrc already sets the default PS1. - # PS1='\h:\w\$ ' - if [ -f /etc/bash.bashrc ]; then - . /etc/bash.bashrc - fi - else - if [ "`id -u`" -eq 0 ]; then - PS1='# ' - else - PS1='$ ' - fi - fi -fi - -if [ -d /etc/profile.d ]; then - for i in /etc/profile.d/*.sh; do - if [ -r $i ]; then - . $i - fi - done - unset i -fi -export LC_ALL="en_US.UTF-8" diff --git a/archived/ansible/files/system_new/minimal/___etc___systemd___logind.conf b/archived/ansible/files/system_new/minimal/___etc___systemd___logind.conf deleted file mode 100644 index 7a9004a..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___systemd___logind.conf +++ /dev/null @@ -1,38 +0,0 @@ -# This file is part of systemd. -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# Entries in this file show the compile time defaults. -# You can change settings by editing this file. -# Defaults can be restored by simply deleting this file. -# -# See logind.conf(5) for details. - -[Login] -#NAutoVTs=6 -#ReserveVT=6 -#KillUserProcesses=no -#KillOnlyUsers= -#KillExcludeUsers=root -#InhibitDelayMaxSec=5 -#HandlePowerKey=poweroff -#HandleSuspendKey=suspend -#HandleHibernateKey=hibernate -#HandleLidSwitch=suspend -#HandleLidSwitchDocked=ignore -#PowerKeyIgnoreInhibited=no -#SuspendKeyIgnoreInhibited=no -#HibernateKeyIgnoreInhibited=no -#LidSwitchIgnoreInhibited=yes -#HoldoffTimeoutSec=30s -#IdleAction=ignore -#IdleActionSec=30min -#RuntimeDirectorySize=10% -#RemoveIPC=yes -#InhibitorsMax=8192 -#SessionsMax=8192 -#UserTasksMax=33% -HandleLidSwitch=hibernate diff --git a/archived/ansible/files/system_new/minimal/___etc___timezone b/archived/ansible/files/system_new/minimal/___etc___timezone deleted file mode 100644 index 94d5acc..0000000 --- a/archived/ansible/files/system_new/minimal/___etc___timezone +++ /dev/null @@ -1 +0,0 @@ -Europe/Berlin diff --git a/archived/ansible/run_root.sh b/archived/ansible/run_root.sh deleted file mode 100755 index 02856c2..0000000 --- a/archived/ansible/run_root.sh +++ /dev/null @@ -1 +0,0 @@ -ansible-playbook -i 'localhost,' -c local config.yml diff --git a/archived/ansible/run_root_new.sh b/archived/ansible/run_root_new.sh deleted file mode 100755 index 36408a8..0000000 --- a/archived/ansible/run_root_new.sh +++ /dev/null @@ -1 +0,0 @@ -ansible-playbook -i 'localhost,' -e system_name=X200s -c local config_new.yml diff --git a/archived/ansible/run_user.sh b/archived/ansible/run_user.sh deleted file mode 100755 index e52b521..0000000 --- a/archived/ansible/run_user.sh +++ /dev/null @@ -1 +0,0 @@ -ansible-playbook -i 'localhost,' -c local user.yml diff --git a/archived/ansible/run_user_new.sh b/archived/ansible/run_user_new.sh deleted file mode 100755 index 510faad..0000000 --- a/archived/ansible/run_user_new.sh +++ /dev/null @@ -1 +0,0 @@ -ansible-playbook -i 'localhost,' -e system_name=X200s -c local user_new.yml diff --git a/archived/ansible/tasks/initial_purge.yml b/archived/ansible/tasks/initial_purge.yml deleted file mode 100644 index 63fddd9..0000000 --- a/archived/ansible/tasks/initial_purge.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - -- name: collect officially required packages - shell: dpkg-query -Wf '${Package} ${Priority}\n' | grep ' required' | sed 's/ required//' > /tmp/list_white_unsorted - -- name: add "ifupdown" and "isc-dhcp-client" (to keep internet connection afterwards) and "ansible" (to keep its modules available for continuing the configuration) to required packages - shell: echo 'ifupdown' >> /tmp/list_white_unsorted && echo 'isc-dhcp-client' >> /tmp/list_white_unsorted && echo 'ansible' >> /tmp/list_white_unsorted && sort /tmp/list_white_unsorted > /tmp/list_white - -- name: collect currently installed packages - shell: dpkg-query -Wf '${Package}\n' > /tmp/list_all_packages && sort /tmp/list_all_packages > /tmp/foo && mv /tmp/foo /tmp/list_all_packages - -- name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed - shell: comm -3 /tmp/list_all_packages /tmp/list_white > /tmp/list_black - -- name: mark all packages from black list as automatically installed - shell: apt-mark auto $(cat /tmp/list_black) - -- name: purge all packages automatically installed that are not depended on - shell: DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove - -- name: ensure flags directory exists - file: path=flags state=directory - -- name: set initial_purge_happened flag, so that this whole process does not get repeated - file: path=flags/initial_purge_happened state=touch diff --git a/archived/ansible/tasks/qutebrowser.yml b/archived/ansible/tasks/qutebrowser.yml deleted file mode 100644 index 916c854..0000000 --- a/archived/ansible/tasks/qutebrowser.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- - -- name: Set qutebrowser, python3-pypeg2 facts. - set_fact: - qutebrowser_deb_url: https://github.com/qutebrowser/qutebrowser/releases/download/v0.11.0/qutebrowser_0.11.0-1_all.deb - python3pypeg2_deb_url: https://qutebrowser.org/python3-pypeg2_2.15.2-1_all.deb - qutebrowser_deb_path: /tmp/qutebrowser.deb - python3pypeg2_deb_path: /tmp/python3-pypeg2.deb - -- name: Check if qutebrowser is installed. - command: dpkg-query -W qutebrowser - register: qutebrowser_debcheck - failed_when: qutebrowser_debcheck.rc > 1 - changed_when: qutebrowser_debcheck.rc == 1 - -- name: Check if qutebrowser-dependency python3-pypeg2 is installed. - command: dpkg-query -W python3-pypeg2 - register: python3pypeg2_debcheck - failed_when: python3pypeg2_debcheck.rc > 1 - changed_when: python3pypeg2_debcheck.rc == 1 - when: qutebrowser_debcheck.rc == 1 - -- name: Download python3-pypeg2 package. - get_url: url={{ python3pypeg2_deb_url }} dest={{ python3pypeg2_deb_path }} - when: qutebrowser_debcheck.rc == 1 and python3pypeg2_debcheck.rc == 1 - -- name: Download qutebrowser package. - get_url: url={{ qutebrowser_deb_url }} dest={{ qutebrowser_deb_path }} - when: qutebrowser_debcheck.rc == 1 - -# We use command: apt as a workaround because the Ansible apt module installs -# the Depends of the .deb marked as manual while we want them marked as auto. -- name: Install python3-pypeg2 package, - command: apt install --yes "{{ python3pypeg2_deb_path}}" - when: qutebrowser_debcheck.rc == 1 and python3pypeg2_debcheck.rc == 1 - -- name: Mark python3-pypeg2 package as automatically installed. - command: apt-mark auto python3-pypeg2 - when: qutebrowser_debcheck.rc == 1 and python3pypeg2_debcheck.rc == 1 - -# We use command: apt as a workaround because the Ansible apt module installs -# the Depends of the .deb marked as manual while we want them marked as auto. -- name: Install qutebrowser package. - command: apt install --yes "{{ qutebrowser_deb_path}}" - when: qutebrowser_debcheck.rc == 1 diff --git a/archived/ansible/user.yml b/archived/ansible/user.yml deleted file mode 100644 index 07dd189..0000000 --- a/archived/ansible/user.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: all - tasks: - - - name: ensure ~/.vimbackups directory - file: state=directory dest=~/.vimbackups - - name: Ensure dotfile symlinks - file: state=link force=yes src={{item}} dest=~/.{{item|basename}} - with_fileglob: - - ~/config/dotfiles/minimal/* - - ~/config/dotfiles/user/thinkpad/minimal/* - - ~/config/dotfiles/user/thinkpad/W530/* - - name: ensure ~/downloads directory - file: state=directory dest=~/downloads diff --git a/archived/ansible/user_new.yml b/archived/ansible/user_new.yml deleted file mode 100644 index d6f46af..0000000 --- a/archived/ansible/user_new.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: all - tasks: - - - name: ensure ~/.vimbackups directory - file: state=directory dest=~/.vimbackups - - name: Ensure dotfile symlinks - file: state=link force=yes src={{item}} dest=~/.{{item|basename}} - with_fileglob: - - ~/config/dotfiles/minimal/* - - ~/config/dotfiles/user/thinkpad/minimal/* - - ~/config/dotfiles/user/thinkpad/{{ system_name }}/* - - name: ensure ~/downloads directory - file: state=directory dest=~/downloads diff --git a/archived/archive_plomroma.py b/archived/archive_plomroma.py deleted file mode 100755 index 0ad89b7..0000000 --- a/archived/archive_plomroma.py +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env python3 -import lxml -import argparse -# use with `find status.plomlompom.com -type f -name "*.html" -exec ./archive_plomroma.py -f {} \;` - -parser = argparse.ArgumentParser(description="archive plom's self-hosted pleroma feed") -parser.add_argument("-f", "--file", dest="file", required=True, help="HTML file to process") -args = parser.parse_args() -print("processing", args.file) - -def print_tree(node, level=0): - tag = node.tag - id = node.get("id") - classes = node.get("class") - text = (node.text or "").strip() - attributes_info = [] - if id: - attributes_info.append(f"id='{id}'") - if classes: - attributes_info.append(f"class='{classes}'") - attr_str = " ".join(attributes_info) - print(" " * level + f"<{tag} {attr_str}>", end="") - if text: - print(f" -> {text}") - else: - print() - for child in node: - print_tree(child, level + 1) - -with open(args.file, "r", encoding="utf-8") as file: - content = file.read() -from lxml import html -tree = html.fromstring(content) - -atom_links = tree.xpath('/html/head/link[@rel="alternate"]') -for atom_link in atom_links: - atom_link.getparent().remove(atom_link) -comments = tree.xpath('//comment()') -for comment in comments: - comment.getparent().remove(comment) -forms = tree.xpath('//form') -for form in forms: - form.getparent().remove(form) - - -def has_class(context, element, class_name): - classes = element[0].get('class', '').split() - return class_name in classes -ns = lxml.etree.FunctionNamespace(None) -ns['has-class'] = has_class -matching_divs = tree.xpath('//div[has-class(., "activity") and .//div[has-class(., "p-author")] and .//bdi[has-class(., "p-name") and string()!="plomlompom"]]') -imgs = tree.xpath('//img') -for img in imgs: - src = img.get('src') - if src and not src.startswith('https://status.plomlompom.com/'): - img.attrib.pop('src', None) - alt = img.get('alt') - if alt and not alt.startswith('../'): - img.attrib.pop('alt', None) - title = img.get('title') - if title and not title.startswith('../'): - img.attrib.pop('title', None) -removal_notice = "[Removed foreign content for static archive, follow permalink on date to see original.]" -for activity_div in matching_divs: - details = activity_div.xpath('.//details[./div[has-class]]') - for detail in details: - new_div = lxml.etree.Element("div") - new_div.text = removal_notice - detail.getparent().replace(detail, new_div) - e_contents = activity_div.xpath('.//div[has-class(., "e-content") or has-class(., "activity-content")]') - for content in e_contents: - content.clear() - content.text = removal_notice - -header = """ -

contact / privacy

-

plomroma (archived): This site is a static archive of a Pleroma instance formerly hosted by me, to preserve my own messages from that time. Foreign content has been removed, but may still be available via links.

-
-""" -tree.body.insert(0, html.fromstring(header)) - -# print_tree(tree) -with open(args.file, "w", encoding="utf-8") as file: - file.write(html.tostring(tree, pretty_print=True, encoding="utf-8").decode("utf-8")) - -print("done") diff --git a/archived/bin/broiler_in.sh b/archived/bin/broiler_in.sh deleted file mode 100755 index 5b16ddd..0000000 --- a/archived/bin/broiler_in.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd ~/plomlombot-irc -./run.sh -r 604800 -n broiler_in "#nodrama.de" diff --git a/archived/bin/hubbabubba.sh b/archived/bin/hubbabubba.sh deleted file mode 100755 index 50cc0f6..0000000 --- a/archived/bin/hubbabubba.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd ~/plomlombot-irc -./run.sh -r 604800 -n hubbabubba "#freakazoid" diff --git a/archived/bin/i3status_wrapper.py b/archived/bin/i3status_wrapper.py deleted file mode 100755 index aa7b7c2..0000000 --- a/archived/bin/i3status_wrapper.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Inspired by http://code.stapelberg.de/git/i3status/tree/contrib/wrapper.py - -import sys -import json -import subprocess - -def print_nonbuffered(message): - sys.stdout.write(message) - sys.stdout.flush() - -if __name__ == '__main__': - print_nonbuffered(sys.stdin.readline()) - print_nonbuffered(sys.stdin.readline()) - while True: - line, prefix = sys.stdin.readline(), '' - if line.startswith(','): - line, prefix = line[1:], ',' - j = json.loads(line) - if '1' == subprocess.getoutput('xset q | grep LED')[65]: - j.insert(len(j), {'full_text' : 'CAPS', - 'separator_block_width': 40, - 'color': '#FF0000'}) - print_nonbuffered(prefix+json.dumps(j)) diff --git a/archived/bin/install_certs.sh b/archived/bin/install_certs.sh deleted file mode 100755 index 5ef46b0..0000000 --- a/archived/bin/install_certs.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e -set -x - -~/letsencrypt/letsencrypt-auto certonly --standalone -d dump.plomlompom.com -~/letsencrypt/letsencrypt-auto certonly --standalone -d htwtxt.plomlompom.com diff --git a/archived/bin/network.sh b/archived/bin/network.sh deleted file mode 100755 index 5f88461..0000000 --- a/archived/bin/network.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -eth_interface=enp0s25 -wifi_interface=wls1 - -ensure_wifi_on() { - if [ ! "$(wifi)" = "wifi = on" ]; then - #wifi on - ip link set "$wifi_interface" up - fi -} - -if ! echo "${1}"; then - echo 'No command given.' - print_usage - exit 1 -elif [ "${1}" = 'eth_connect' ]; then - ip link set "$eth_interface" up - dhclient "$eth_interface" - -elif [ "${1}" = 'eth_disconnect' ]; then - ip link set "$eth_interface" down - -elif [ "${1}" = 'wifi_scan' ]; then - ensure_wifi_on - ip link set "$wifi_interface" up - iw dev "$wifi_interface" scan | grep SSID - -elif [ "${1}" = 'wifi_connect_open' ]; then - ensure_wifi_on - iw dev "$wifi_interface" connect "${2}" - dhclient "$wifi_interface" - #ip route delete default - #ip route add default via 192.168.1.1 dev wls1 - -elif [ "${1}" = 'wifi_connect_wep_ascii' ]; then - ensure_wifi_on - iw dev "$wifi_interface" connect "${2}" key 0:"${3}" - dhclient "$wifi_interface" - -elif [ "${1}" = 'wifi_connect_wep_hex' ]; then - ensure_wifi_on - iw dev "$wifi_interface" connect "${2}" key d:0:"${3}" - dhclient "$wifi_interface" - -elif [ "${1}" = 'wifi_connect_wpa' ]; then - ensure_wifi_on - wpa_passphrase "${2}" "${3}" > /tmp/wpa_supplicant.conf - wpa_supplicant -B -i "$wifi_interface" -c /tmp/wpa_supplicant.conf - dhclient "$wifi_interface" - -elif [ "${1}" = 'wifi_disconnect' ]; then - ip link set "$wifi_interface" down - -else - echo 'Available commands:' - echo ' eth_connect' - echo ' eth_disconnect' - echo ' wifi_scan' - echo ' wifi_connect_open SSID' - echo ' wifi_connect_wep_ascii SSID KEY' - echo ' wifi_connect_wep_hex SSID KEY' - echo ' wifi_connect_wpa SSID KEY' - echo ' wifi_disconnect' -fi diff --git a/archived/bin/plomlombot.sh b/archived/bin/plomlombot.sh deleted file mode 100755 index 1153d2d..0000000 --- a/archived/bin/plomlombot.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd ~/plomlombot-irc -./run.sh -r 604800 -n botlomplom "#zrolaps" diff --git a/archived/bin/renew_certs.sh b/archived/bin/renew_certs.sh deleted file mode 100755 index d1853b5..0000000 --- a/archived/bin/renew_certs.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -service nginx stop -~/letsencrypt/letsencrypt-auto renew -service nginx restart diff --git a/archived/bin/setup_opendkim.sh b/archived/bin/setup_opendkim.sh deleted file mode 100755 index ce1e3d5..0000000 --- a/archived/bin/setup_opendkim.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -set -e -selector=$1 -file=$2 - -if [ ! -n "$selector" ]; then - cat << EOF -Usage: $0 SELECTOR [KEYFILE] - set up DKIM system and configuration - -If existing KEYFILE is given, set up DKIM to use SELECTOR and apply key from -KEYFILE. - -If existing KEYFILE is not given, generate KEYFILE and DNS TXT file for -SELECTOR. -EOF - exit -fi - -if [ ! "$(id -u)" -eq "0" ]; then - echo "Must be run as root." - exit 1 -fi - -set -x -apt-get -y install opendkim - -if [ ! -n "$file" ]; then - apt-get -y install opendkim-tools - opendkim-genkey -d plomlompom.com -s $selector - apt-get -y --purge autoremove opendkim-tools - set +x - echo - echo 'Generated key file at '$selector'.private.' - echo 'Also generated '$selector'.txt, APPLY its content below to your DNS' \ - 'record.' - echo 'AFTER the waiting time for DNS propagation RERUN this script with' \ - 'the key file as SECOND parameter (still use selector as first one).' - echo - cat $selector.txt -else - if [ ! -f "$file" ]; then - set +x - echo - echo "Keyfile $file does not exist." - exit 1 - fi - cp ~/config/systemfiles/opendkim.conf /etc/opendkim.conf - sed -r -i 's/^#Selector .*$/Selector '$selector'/' /etc/opendkim.conf - mkdir -p /etc/opendkim - if [ -f /etc/opendkim/dkim.key ]; then - cp /etc/opendkim/dkim.key /etc/opendkim/dkim.key~ - fi - cp $file /etc/opendkim/dkim.key - cp ~/config/systemfiles/main.cf /etc/postfix/main.cf - cat >> /etc/postfix/main.cf << EOF - -# Use opendkim at given port as mail filter. -non_smtpd_milters = inet:localhost:12301 -EOF - service opendkim restart - service postfix restart - set +x - echo - echo 'Ensure the DKIM TXT entry in your DNS record matches!' -fi diff --git a/archived/bin/setup_starttls.sh b/archived/bin/setup_starttls.sh deleted file mode 100755 index 3b306c2..0000000 --- a/archived/bin/setup_starttls.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -set -x -set -e -key=$1 -cert=$2 - -if [ ! "$(id -u)" -eq "0" ]; then - echo "Must be run as root." - exit 1 -fi - -key_target=/etc/postfix/key.pem -if [ ! -n "$key" ]; then - if [ ! -f "${key_target}" ]; then - (umask 077; openssl genrsa -out "${key_target}" 2048) - fi -else - cp "$key" "${key_target}" -fi - -fqdn=$(postconf -h myhostname) -cert_target=/etc/postfix/cert.pem -if [ ! -n "$cert" ]; then - if [ ! -f "${cert_target}" ]; then - openssl req -new -key "${key_target}" -x509 -subj "/CN=${fqdn}" -days 3650 -out "${cert_target}" - fi -else - cp "$cert" "${cert_target}" -fi - -cat >> /etc/postfix/main.cf << EOF - -# Enable server-side STARTTLS. -smtpd_tls_cert_file = /etc/postfix/cert.pem -smtpd_tls_key_file = /etc/postfix/key.pem -smtpd_tls_security_level = may -EOF -service postfix restart diff --git a/archived/bin/simplemail.sh b/archived/bin/simplemail.sh deleted file mode 100755 index af0eb1a..0000000 --- a/archived/bin/simplemail.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# This mails to user plom the message in the file named by the first parameter, -# decoded with the first line as subject and everything below the second line -# as the message body. - -subject=`head -1 $1` -body=`tail -n +3 $1` -echo "$body" | mutt -s "$subject" plom diff --git a/archived/bin/simplemail_out.sh b/archived/bin/simplemail_out.sh deleted file mode 100755 index 8340944..0000000 --- a/archived/bin/simplemail_out.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# This mails to plom@plomlompom.com the message in the file named by the first -# parameter, decoded with the first line as subject and everything below the -# second line as the message body. - -subject=`head -1 $1` -body=`tail -n +3 $1` -echo "$body" | mutt -s "$subject" plom@plomlompom.com diff --git a/archived/bin/start_htwtxt.sh b/archived/bin/start_htwtxt.sh deleted file mode 100755 index e5ee45a..0000000 --- a/archived/bin/start_htwtxt.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -$GOPATH/bin/htwtxt \ - --contact 'see http://www.plomlompom.de/' \ - --mailport 587 \ - --mailserver smtp.gmail.com \ - --mailuser christian.heller@gmail.com \ - --port 8000 \ - --signup diff --git a/archived/bin/symlink.sh b/archived/bin/symlink.sh deleted file mode 100755 index d653a0b..0000000 --- a/archived/bin/symlink.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -set -x -set -e - -dir_minimal=~/config/dotfiles/minimal -dir_user_prefix=~/config/dotfiles/user -dir_user_minimal=$dir_user_prefix/minimal -dir_user_machine=$dir_user_prefix/$1/minimal -if [ "$3" = "" ]; then - dir_user_variety=$dir_user_prefix/$1/$2 -else - dir_user_variety=$dir_user_prefix/$1/$2/minimal -fi -dir_user_subvariety=$dir_user_prefix/$1/$2/$3 -dir_root=~/config/dotfiles/root -homedir=`echo ~` -find ~ -lname $homedir'/config/*' -delete -for file in `ls $dir_minimal`; do - ln -fs $dir_minimal/$file ~/.$file -done -if [ "$(id -u)" -eq "0" ]; then - for file in `ls $dir_root`; do - ln -fs $dir_root/$file ~/.$file - done -else - for file in `ls $dir_user_minimal`; do - ln -fs $dir_user_minimal/$file ~/.$file - done - for file in `ls $dir_user_machine`; do - ln -fs $dir_user_machine/$file ~/.$file - done - for file in `ls $dir_user_variety`; do - ln -fs $dir_user_variety/$file ~/.$file - done - if [ ! "$3" = "" ]; then - for file in `ls $dir_user_subvariety`; do - ln -fs $dir_user_subvariety/$file ~/.$file - done - fi -fi diff --git a/archived/bin/w530_backlight.sh b/archived/bin/w530_backlight.sh deleted file mode 100755 index 5b24fa7..0000000 --- a/archived/bin/w530_backlight.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -# A very primitive backlight setter with a hardcoded backlight path, to replace -# xbacklight which currently does not work on my system. - -if ! echo "${1}" | egrep -q '^[0-9]+$' && ! [ "${1}" = "+" -o "${1}" = "-" ]; then - echo 'Argument must be a number, or "+", or "-".' - exit 1 -fi -backlight_dir=/sys/class/backlight/intel_backlight -max_brightness=$(cat "${backlight_dir}"/max_brightness) -target="${backlight_dir}"/brightness -if [ "${1}" = "+" -o "${1}" = "-" ]; then - fract=$(expr "${max_brightness}" / 20) - cur_brightness=$(cat "${backlight_dir}"/brightness) - brightness=$(expr "${cur_brightness}" "${1}" "${fract}") - if [ "${brightness}" -gt "${max_brightness}" ]; then - brightness="${max_brightness}" - elif [ "${brightness}" -lt "0" ]; then - brightness=0 - fi - sudo sh -c 'echo '"${brightness}"' > '"${target}" - exit 0 -fi -percentage=${1} -if [ "${percentage}" = '100' ]; then - sudo sh -c 'echo '"${max_brightness}"' > '"${target}" -else - fract=$(expr "${max_brightness}" / 100) - brightness=$(expr "${percentage}" \* "${fract}") - sudo sh -c 'echo '"${brightness}"' > '"${target}" -fi diff --git a/archived/bin/w530_startx_force_nvidia.sh b/archived/bin/w530_startx_force_nvidia.sh deleted file mode 100755 index 3c3ca59..0000000 --- a/archived/bin/w530_startx_force_nvidia.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -# Undo bumblebee setup. -sudo service bumblebeed stop -sudo modprobe nvidia-drm -sudo update-alternatives --set glx /usr/lib/nvidia - -# Use special xorg.conf and pass NVIDIA_DIRECT directive to .xinitrc. -NVIDIA_DIRECT=1 startx -- -config xorg.conf.forced_nvidia - -# Recreate bumblebee setup. -sudo service bumblebeed start -sudo update-alternatives --auto glx diff --git a/archived/bin/weechat-wrapper.sh b/archived/bin/weechat-wrapper.sh deleted file mode 100755 index 333c9d1..0000000 --- a/archived/bin/weechat-wrapper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Enforce ~/.weechatrc as sole persistent weechat config file. -~/config/bin/simplemail.sh ~/config/mails/weechat_restart_reminder -rm -rf ~/.weechat/ -WEECHATCONF=`tr '\n' ';' < ~/.weechatrc` -weechat -r "$WEECHATCONF" -rm -rf ~/.weechat/ diff --git a/archived/bin/wicd-wrapper.sh b/archived/bin/wicd-wrapper.sh deleted file mode 100755 index 8ed74bd..0000000 --- a/archived/bin/wicd-wrapper.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -check_wifi_id_set() { - if ! echo "${1}" | egrep -q '^[0-9]+$'; then - echo 'Wifi identifier must be integer.' - exit 1 - fi -} - -ensure_wifi_on() { - if [ ! "$(wifi)" = "wifi = on" ]; then - sudo wifi on - fi -} - -print_usage() { - echo 'Available commands:' - echo ' eth_connect' - echo ' eth_disconnect' - echo ' wifi_scan' - echo ' wifi_info WIFI_ID' - echo ' wifi_set_wpa WIFI_ID KEY' - echo ' wifi_connect WIFI_ID' - echo ' wifi_disconnect' -} - -if ! echo "${1}"; then - echo 'No command given.' - print_usage - exit 1 -elif [ "${1}" = 'eth_connect' ]; then - wicd-cli --wired --connect - -elif [ "${1}" = 'eth_disconnect' ]; then - wicd-cli --wired --disconnect - -elif [ "${1}" = 'wifi_scan' ]; then - ensure_wifi_on - wicd-cli --wireless --scan - wicd-cli --wireless --list-networks - -elif [ "${1}" = 'wifi_info' ]; then - check_wifi_id_set "${2}" - wicd-cli --wireless --network="${2}" --network-details - -elif [ "${1}" = 'wifi_set_wpa' ]; then - check_wifi_id_set "${2}" - if ! echo "${3}" ; then - echo 'No key set.' - exit 1 - fi - wicd-cli --wireless --network="${2}" --network-property=enctype --set-to=wpa - wicd-cli --wireless --network="${2}" --network-property=key --set-to="${3}" - -elif [ "${1}" = 'wifi_connect' ]; then - ensure_wifi_on - check_wifi_id_set "${2}" - wicd-cli --wireless --network="${2}" --connect - -elif [ "${1}" = 'wifi_disconnect' ]; then - wicd-cli --wireless --disconnect - -else - echo 'Unknown command.' - print_usage - exit 1 -fi diff --git a/archived/bin/zinskritik.sh b/archived/bin/zinskritik.sh deleted file mode 100755 index 9ad293a..0000000 --- a/archived/bin/zinskritik.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd ~/plomlombot-irc -./run.sh -r 604800 -n histomat "#freie-gesellschaft" diff --git a/archived/buster/apt-mark/all b/archived/bullseye/apt-mark/all similarity index 100% rename from archived/buster/apt-mark/all rename to archived/bullseye/apt-mark/all diff --git a/archived/buster/apt-mark/desktop b/archived/bullseye/apt-mark/desktop similarity index 100% rename from archived/buster/apt-mark/desktop rename to archived/bullseye/apt-mark/desktop diff --git a/archived/buster/apt-mark/dumpsite b/archived/bullseye/apt-mark/dumpsite similarity index 100% rename from archived/buster/apt-mark/dumpsite rename to archived/bullseye/apt-mark/dumpsite diff --git a/bullseye/apt-mark/microblogpub b/archived/bullseye/apt-mark/microblogpub similarity index 100% rename from bullseye/apt-mark/microblogpub rename to archived/bullseye/apt-mark/microblogpub diff --git a/archived/buster/apt-mark/play b/archived/bullseye/apt-mark/play similarity index 100% rename from archived/buster/apt-mark/play rename to archived/bullseye/apt-mark/play diff --git a/archived/buster/apt-mark/server b/archived/bullseye/apt-mark/server similarity index 100% rename from archived/buster/apt-mark/server rename to archived/bullseye/apt-mark/server diff --git a/archived/buster/apt-mark/thinkpad b/archived/bullseye/apt-mark/thinkpad similarity index 100% rename from archived/buster/apt-mark/thinkpad rename to archived/bullseye/apt-mark/thinkpad diff --git a/bullseye/apt-mark/user b/archived/bullseye/apt-mark/user similarity index 100% rename from bullseye/apt-mark/user rename to archived/bullseye/apt-mark/user diff --git a/archived/buster/apt-mark/w530 b/archived/bullseye/apt-mark/w530 similarity index 100% rename from archived/buster/apt-mark/w530 rename to archived/bullseye/apt-mark/w530 diff --git a/bookworm/apt-mark/web b/archived/bullseye/apt-mark/web similarity index 100% rename from bookworm/apt-mark/web rename to archived/bullseye/apt-mark/web diff --git a/bullseye/apt-mark/website b/archived/bullseye/apt-mark/website similarity index 100% rename from bullseye/apt-mark/website rename to archived/bullseye/apt-mark/website diff --git a/bullseye/borg.sh b/archived/bullseye/borg.sh similarity index 100% rename from bullseye/borg.sh rename to archived/bullseye/borg.sh diff --git a/bookworm/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies b/archived/bullseye/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies similarity index 100% rename from bookworm/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies rename to archived/bullseye/etc_files/all/etc/apt/apt.conf.d/99_minimize_dependencies diff --git a/bullseye/etc_files/all/etc/apt/sources.list b/archived/bullseye/etc_files/all/etc/apt/sources.list similarity index 100% rename from bullseye/etc_files/all/etc/apt/sources.list rename to archived/bullseye/etc_files/all/etc/apt/sources.list diff --git a/bookworm/etc_files/all/etc/default/locale b/archived/bullseye/etc_files/all/etc/default/locale similarity index 100% rename from bookworm/etc_files/all/etc/default/locale rename to archived/bullseye/etc_files/all/etc/default/locale diff --git a/bookworm/etc_files/all/etc/locale.gen b/archived/bullseye/etc_files/all/etc/locale.gen similarity index 100% rename from bookworm/etc_files/all/etc/locale.gen rename to archived/bullseye/etc_files/all/etc/locale.gen diff --git a/bookworm/etc_files/all/etc/timezone b/archived/bullseye/etc_files/all/etc/timezone similarity index 100% rename from bookworm/etc_files/all/etc/timezone rename to archived/bullseye/etc_files/all/etc/timezone diff --git a/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.service b/archived/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.service similarity index 100% rename from bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.service rename to archived/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.service diff --git a/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.timer b/archived/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.timer similarity index 100% rename from bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.timer rename to archived/bullseye/etc_files/daily_reboot/etc/systemd/system/reboot.timer diff --git a/bullseye/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx b/archived/bullseye/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx similarity index 100% rename from bullseye/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx rename to archived/bullseye/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx diff --git a/archived/buster/etc_files/dumpsite/etc/systemd/system/url_catcher.service b/archived/bullseye/etc_files/dumpsite/etc/systemd/system/url_catcher.service similarity index 100% rename from archived/buster/etc_files/dumpsite/etc/systemd/system/url_catcher.service rename to archived/bullseye/etc_files/dumpsite/etc/systemd/system/url_catcher.service diff --git a/bullseye/etc_files/microblogpub/etc/apt/sources.list b/archived/bullseye/etc_files/microblogpub/etc/apt/sources.list similarity index 100% rename from bullseye/etc_files/microblogpub/etc/apt/sources.list rename to archived/bullseye/etc_files/microblogpub/etc/apt/sources.list diff --git a/bullseye/etc_files/microblogpub/etc/nginx/sites-available/microblogpub.nginx b/archived/bullseye/etc_files/microblogpub/etc/nginx/sites-available/microblogpub.nginx similarity index 100% rename from bullseye/etc_files/microblogpub/etc/nginx/sites-available/microblogpub.nginx rename to archived/bullseye/etc_files/microblogpub/etc/nginx/sites-available/microblogpub.nginx diff --git a/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service b/archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service similarity index 100% rename from bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service rename to archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub.service diff --git a/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.service b/archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.service similarity index 100% rename from bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.service rename to archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.service diff --git a/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.timer b/archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.timer similarity index 100% rename from bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.timer rename to archived/bullseye/etc_files/microblogpub/etc/systemd/system/microblogpub_prune.timer diff --git a/archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.service b/archived/bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.service similarity index 100% rename from archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.service rename to archived/bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.service diff --git a/archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/timers.target.wants/encrypt_chatlogs.timer b/archived/bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer similarity index 100% rename from archived/all_new_2018/linkable_etc_files/play/etc/systemd/system/timers.target.wants/encrypt_chatlogs.timer rename to archived/bullseye/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer diff --git a/bullseye/etc_files/server/etc/ssh/sshd_config b/archived/bullseye/etc_files/server/etc/ssh/sshd_config similarity index 100% rename from bullseye/etc_files/server/etc/ssh/sshd_config rename to archived/bullseye/etc_files/server/etc/ssh/sshd_config diff --git a/archived/buster/etc_files/thinkpad/etc/default/tlp b/archived/bullseye/etc_files/thinkpad/etc/default/tlp similarity index 100% rename from archived/buster/etc_files/thinkpad/etc/default/tlp rename to archived/bullseye/etc_files/thinkpad/etc/default/tlp diff --git a/bullseye/etc_files/thinkpad/etc/network/interfaces b/archived/bullseye/etc_files/thinkpad/etc/network/interfaces similarity index 100% rename from bullseye/etc_files/thinkpad/etc/network/interfaces rename to archived/bullseye/etc_files/thinkpad/etc/network/interfaces diff --git a/archived/buster/etc_files/thinkpad/etc/systemd/logind.conf b/archived/bullseye/etc_files/thinkpad/etc/systemd/logind.conf similarity index 100% rename from archived/buster/etc_files/thinkpad/etc/systemd/logind.conf rename to archived/bullseye/etc_files/thinkpad/etc/systemd/logind.conf diff --git a/bookworm/etc_files/web/etc/nftables.conf b/archived/bullseye/etc_files/web/etc/nftables.conf similarity index 100% rename from bookworm/etc_files/web/etc/nftables.conf rename to archived/bullseye/etc_files/web/etc/nftables.conf diff --git a/bookworm/etc_files/web/etc/nginx/nginx.conf b/archived/bullseye/etc_files/web/etc/nginx/nginx.conf similarity index 100% rename from bookworm/etc_files/web/etc/nginx/nginx.conf rename to archived/bullseye/etc_files/web/etc/nginx/nginx.conf diff --git a/archived/buster/etc_files/website/etc/gitweb.conf b/archived/bullseye/etc_files/website/etc/gitweb.conf similarity index 100% rename from archived/buster/etc_files/website/etc/gitweb.conf rename to archived/bullseye/etc_files/website/etc/gitweb.conf diff --git a/bullseye/etc_files/website/etc/nginx/sites-available/website.nginx b/archived/bullseye/etc_files/website/etc/nginx/sites-available/website.nginx similarity index 100% rename from bullseye/etc_files/website/etc/nginx/sites-available/website.nginx rename to archived/bullseye/etc_files/website/etc/nginx/sites-available/website.nginx diff --git a/archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service b/archived/bullseye/etc_files/website/etc/systemd/system/plomlombot.service similarity index 100% rename from archived/all_new_2018/linkable_etc_files/web/etc/systemd/system/plomlombot.service rename to archived/bullseye/etc_files/website/etc/systemd/system/plomlombot.service diff --git a/bullseye/home_files/minimal/.bashrc b/archived/bullseye/home_files/minimal/.bashrc similarity index 100% rename from bullseye/home_files/minimal/.bashrc rename to archived/bullseye/home_files/minimal/.bashrc diff --git a/bullseye/home_files/root/.shell_prompt_color b/archived/bullseye/home_files/root/.shell_prompt_color similarity index 100% rename from bullseye/home_files/root/.shell_prompt_color rename to archived/bullseye/home_files/root/.shell_prompt_color diff --git a/bookworm/home_files/user/.Xresources b/archived/bullseye/home_files/user/.Xresources similarity index 100% rename from bookworm/home_files/user/.Xresources rename to archived/bullseye/home_files/user/.Xresources diff --git a/bookworm/home_files/user/.borgrepos b/archived/bullseye/home_files/user/.borgrepos similarity index 100% rename from bookworm/home_files/user/.borgrepos rename to archived/bullseye/home_files/user/.borgrepos diff --git a/bullseye/home_files/user/.config/i3/config b/archived/bullseye/home_files/user/.config/i3/config similarity index 100% rename from bullseye/home_files/user/.config/i3/config rename to archived/bullseye/home_files/user/.config/i3/config diff --git a/bullseye/home_files/user/.emacs.d/init.el b/archived/bullseye/home_files/user/.emacs.d/init.el similarity index 100% rename from bullseye/home_files/user/.emacs.d/init.el rename to archived/bullseye/home_files/user/.emacs.d/init.el diff --git a/bullseye/home_files/user/.gitconfig b/archived/bullseye/home_files/user/.gitconfig similarity index 100% rename from bullseye/home_files/user/.gitconfig rename to archived/bullseye/home_files/user/.gitconfig diff --git a/archived/buster/home_files/user/.mbsyncrc b/archived/bullseye/home_files/user/.mbsyncrc similarity index 100% rename from archived/buster/home_files/user/.mbsyncrc rename to archived/bullseye/home_files/user/.mbsyncrc diff --git a/bookworm/home_files/user/.notmuch-config b/archived/bullseye/home_files/user/.notmuch-config similarity index 100% rename from bookworm/home_files/user/.notmuch-config rename to archived/bullseye/home_files/user/.notmuch-config diff --git a/bookworm/home_files/user/.shell_prompt_color b/archived/bullseye/home_files/user/.shell_prompt_color similarity index 100% rename from bookworm/home_files/user/.shell_prompt_color rename to archived/bullseye/home_files/user/.shell_prompt_color diff --git a/archived/buster/home_files/user/.tridactylrc b/archived/bullseye/home_files/user/.tridactylrc similarity index 100% rename from archived/buster/home_files/user/.tridactylrc rename to archived/bullseye/home_files/user/.tridactylrc diff --git a/archived/buster/home_files/user/.xinitrc b/archived/bullseye/home_files/user/.xinitrc similarity index 100% rename from archived/buster/home_files/user/.xinitrc rename to archived/bullseye/home_files/user/.xinitrc diff --git a/archived/buster/home_files/user/mail_sync.sh b/archived/bullseye/home_files/user/mail_sync.sh similarity index 100% rename from archived/buster/home_files/user/mail_sync.sh rename to archived/bullseye/home_files/user/mail_sync.sh diff --git a/archived/buster/home_files/user/public_repos/repos b/archived/bullseye/home_files/user/public_repos/repos similarity index 100% rename from archived/buster/home_files/user/public_repos/repos rename to archived/bullseye/home_files/user/public_repos/repos diff --git a/archived/buster/home_files/x220/.config/i3status/config b/archived/bullseye/home_files/w530/.config/i3status/config similarity index 100% rename from archived/buster/home_files/x220/.config/i3status/config rename to archived/bullseye/home_files/w530/.config/i3status/config diff --git a/bullseye/home_files/x220/.config/i3status/config b/archived/bullseye/home_files/x220/.config/i3status/config similarity index 100% rename from bullseye/home_files/x220/.config/i3status/config rename to archived/bullseye/home_files/x220/.config/i3status/config diff --git a/archived/buster/etc_files/user/opt/firefox/blank.html b/archived/bullseye/other_files/blank.html similarity index 100% rename from archived/buster/etc_files/user/opt/firefox/blank.html rename to archived/bullseye/other_files/blank.html diff --git a/archived/buster/other_files/blog_hook_post-receive b/archived/bullseye/other_files/blog_hook_post-receive similarity index 100% rename from archived/buster/other_files/blog_hook_post-receive rename to archived/bullseye/other_files/blog_hook_post-receive diff --git a/archived/buster/other_files/dumpsite_index.html b/archived/bullseye/other_files/dumpsite_index.html similarity index 100% rename from archived/buster/other_files/dumpsite_index.html rename to archived/bullseye/other_files/dumpsite_index.html diff --git a/bullseye/other_files/plomlombot_daemon.sh b/archived/bullseye/other_files/plomlombot_daemon.sh similarity index 100% rename from bullseye/other_files/plomlombot_daemon.sh rename to archived/bullseye/other_files/plomlombot_daemon.sh diff --git a/archived/buster/other_files/plomlombot_hook_post-receive b/archived/bullseye/other_files/plomlombot_hook_post-receive similarity index 100% rename from archived/buster/other_files/plomlombot_hook_post-receive rename to archived/bullseye/other_files/plomlombot_hook_post-receive diff --git a/bullseye/other_files/prune_microblogpub.sh b/archived/bullseye/other_files/prune_microblogpub.sh similarity index 100% rename from bullseye/other_files/prune_microblogpub.sh rename to archived/bullseye/other_files/prune_microblogpub.sh diff --git a/archived/buster/other_files/url-catcher_customizations.json b/archived/bullseye/other_files/url-catcher_customizations.json similarity index 100% rename from archived/buster/other_files/url-catcher_customizations.json rename to archived/bullseye/other_files/url-catcher_customizations.json diff --git a/archived/buster/other_files/website_hook_post-receive b/archived/bullseye/other_files/website_hook_post-receive similarity index 100% rename from archived/buster/other_files/website_hook_post-receive rename to archived/bullseye/other_files/website_hook_post-receive diff --git a/archived/buster/other_files/weechat-wrapper.sh b/archived/bullseye/other_files/weechat-wrapper.sh similarity index 100% rename from archived/buster/other_files/weechat-wrapper.sh rename to archived/bullseye/other_files/weechat-wrapper.sh diff --git a/archived/buster/other_files/weechatlogs_encrypter.sh b/archived/bullseye/other_files/weechatlogs_encrypter.sh similarity index 100% rename from archived/buster/other_files/weechatlogs_encrypter.sh rename to archived/bullseye/other_files/weechatlogs_encrypter.sh diff --git a/bullseye/other_files/weechatrc b/archived/bullseye/other_files/weechatrc similarity index 100% rename from bullseye/other_files/weechatrc rename to archived/bullseye/other_files/weechatrc diff --git a/archived/buster/other_files/zettel_hook_post-receive b/archived/bullseye/other_files/zettel_hook_post-receive similarity index 100% rename from archived/buster/other_files/zettel_hook_post-receive rename to archived/bullseye/other_files/zettel_hook_post-receive diff --git a/archived/buster/setup_scripts/copy_dirtree.sh b/archived/bullseye/setup_scripts/copy_dirtree.sh similarity index 100% rename from archived/buster/setup_scripts/copy_dirtree.sh rename to archived/bullseye/setup_scripts/copy_dirtree.sh diff --git a/bullseye/setup_scripts/init_user_and_keybased_login.sh b/archived/bullseye/setup_scripts/init_user_and_keybased_login.sh similarity index 100% rename from bullseye/setup_scripts/init_user_and_keybased_login.sh rename to archived/bullseye/setup_scripts/init_user_and_keybased_login.sh diff --git a/bullseye/setup_scripts/init_user_login.sh b/archived/bullseye/setup_scripts/init_user_login.sh similarity index 100% rename from bullseye/setup_scripts/init_user_login.sh rename to archived/bullseye/setup_scripts/init_user_login.sh diff --git a/bullseye/setup_scripts/install_for_target.sh b/archived/bullseye/setup_scripts/install_for_target.sh similarity index 100% rename from bullseye/setup_scripts/install_for_target.sh rename to archived/bullseye/setup_scripts/install_for_target.sh diff --git a/bullseye/setup_scripts/migrate_borg.sh b/archived/bullseye/setup_scripts/migrate_borg.sh similarity index 100% rename from bullseye/setup_scripts/migrate_borg.sh rename to archived/bullseye/setup_scripts/migrate_borg.sh diff --git a/archived/all_new_2018/setup_scripts/mirror_dir.sh b/archived/bullseye/setup_scripts/mirror_dir.sh similarity index 100% rename from archived/all_new_2018/setup_scripts/mirror_dir.sh rename to archived/bullseye/setup_scripts/mirror_dir.sh diff --git a/bullseye/setup_scripts/misc.sh b/archived/bullseye/setup_scripts/misc.sh similarity index 100% rename from bullseye/setup_scripts/misc.sh rename to archived/bullseye/setup_scripts/misc.sh diff --git a/archived/buster/setup_scripts/prepare_to_meet_server.sh b/archived/bullseye/setup_scripts/prepare_to_meet_server.sh similarity index 100% rename from archived/buster/setup_scripts/prepare_to_meet_server.sh rename to archived/bullseye/setup_scripts/prepare_to_meet_server.sh diff --git a/bullseye/setup_scripts/purge_nonrequireds.sh b/archived/bullseye/setup_scripts/purge_nonrequireds.sh similarity index 100% rename from bullseye/setup_scripts/purge_nonrequireds.sh rename to archived/bullseye/setup_scripts/purge_nonrequireds.sh diff --git a/archived/buster/setup_scripts/set_hostname_and_fqdn.sh b/archived/bullseye/setup_scripts/set_hostname_and_fqdn.sh similarity index 100% rename from archived/buster/setup_scripts/set_hostname_and_fqdn.sh rename to archived/bullseye/setup_scripts/set_hostname_and_fqdn.sh diff --git a/bullseye/setup_scripts/setup.sh b/archived/bullseye/setup_scripts/setup.sh similarity index 100% rename from bullseye/setup_scripts/setup.sh rename to archived/bullseye/setup_scripts/setup.sh diff --git a/bullseye/setup_scripts/setup_daily_reboot.sh b/archived/bullseye/setup_scripts/setup_daily_reboot.sh similarity index 100% rename from bullseye/setup_scripts/setup_daily_reboot.sh rename to archived/bullseye/setup_scripts/setup_daily_reboot.sh diff --git a/bullseye/setup_scripts/setup_desktop.sh b/archived/bullseye/setup_scripts/setup_desktop.sh similarity index 100% rename from bullseye/setup_scripts/setup_desktop.sh rename to archived/bullseye/setup_scripts/setup_desktop.sh diff --git a/bullseye/setup_scripts/setup_dumpsite.sh b/archived/bullseye/setup_scripts/setup_dumpsite.sh similarity index 100% rename from bullseye/setup_scripts/setup_dumpsite.sh rename to archived/bullseye/setup_scripts/setup_dumpsite.sh diff --git a/bullseye/setup_scripts/setup_firefox.sh b/archived/bullseye/setup_scripts/setup_firefox.sh similarity index 100% rename from bullseye/setup_scripts/setup_firefox.sh rename to archived/bullseye/setup_scripts/setup_firefox.sh diff --git a/bullseye/setup_scripts/setup_home.sh b/archived/bullseye/setup_scripts/setup_home.sh similarity index 100% rename from bullseye/setup_scripts/setup_home.sh rename to archived/bullseye/setup_scripts/setup_home.sh diff --git a/bullseye/setup_scripts/setup_microblogpub.sh b/archived/bullseye/setup_scripts/setup_microblogpub.sh similarity index 100% rename from bullseye/setup_scripts/setup_microblogpub.sh rename to archived/bullseye/setup_scripts/setup_microblogpub.sh diff --git a/bullseye/setup_scripts/setup_play.sh b/archived/bullseye/setup_scripts/setup_play.sh similarity index 100% rename from bullseye/setup_scripts/setup_play.sh rename to archived/bullseye/setup_scripts/setup_play.sh diff --git a/bullseye/setup_scripts/setup_server.sh b/archived/bullseye/setup_scripts/setup_server.sh similarity index 100% rename from bullseye/setup_scripts/setup_server.sh rename to archived/bullseye/setup_scripts/setup_server.sh diff --git a/bullseye/setup_scripts/setup_website.sh b/archived/bullseye/setup_scripts/setup_website.sh similarity index 100% rename from bullseye/setup_scripts/setup_website.sh rename to archived/bullseye/setup_scripts/setup_website.sh diff --git a/archived/buster/apt-mark/eeepc b/archived/buster/apt-mark/eeepc deleted file mode 100644 index 73a755f..0000000 --- a/archived/buster/apt-mark/eeepc +++ /dev/null @@ -1,3 +0,0 @@ -# for wifi -firmware-ralink -# diff --git a/archived/buster/apt-mark/mail b/archived/buster/apt-mark/mail deleted file mode 100644 index 1ef369d..0000000 --- a/archived/buster/apt-mark/mail +++ /dev/null @@ -1,17 +0,0 @@ -# smtp server -postfix -# opendkim -opendkim -opendkim-tools -# for pingmail -mailutils -# ssl -certbot -# IMAPS -pwgen -dovecot-imapd -# sieve filtering -dovecot-lmtpd -dovecot-sieve -# to funnel mail from additional server -fetchmail diff --git a/archived/buster/apt-mark/old_server b/archived/buster/apt-mark/old_server deleted file mode 100644 index c3d995b..0000000 --- a/archived/buster/apt-mark/old_server +++ /dev/null @@ -1,2 +0,0 @@ -# because it contains ifconfig -net-tools diff --git a/archived/buster/apt-mark/peertube b/archived/buster/apt-mark/peertube deleted file mode 100644 index 5b73bac..0000000 --- a/archived/buster/apt-mark/peertube +++ /dev/null @@ -1,15 +0,0 @@ -ffmpeg -postgresql -postgresql-contrib -openssl -redis-server -python-dev -# only needed for setup -g++ -make -git -curl -unzip -libncurses5 -pwgen -wget diff --git a/archived/buster/apt-mark/pleroma b/archived/buster/apt-mark/pleroma deleted file mode 100644 index ec7a134..0000000 --- a/archived/buster/apt-mark/pleroma +++ /dev/null @@ -1,5 +0,0 @@ -# Pleroma DB -postgresql -postgresql-contrib -# only needed for setup -pwgen diff --git a/archived/buster/apt-mark/pleroma_otp b/archived/buster/apt-mark/pleroma_otp deleted file mode 100644 index 4805a43..0000000 --- a/archived/buster/apt-mark/pleroma_otp +++ /dev/null @@ -1,4 +0,0 @@ -# only needed for setup -curl -unzip -libncurses5 diff --git a/archived/buster/apt-mark/pleroma_source b/archived/buster/apt-mark/pleroma_source deleted file mode 100644 index 2b1cd35..0000000 --- a/archived/buster/apt-mark/pleroma_source +++ /dev/null @@ -1,4 +0,0 @@ -# only needed for setup -build-essential -wget -gnupg diff --git a/archived/buster/apt-mark/seedbox b/archived/buster/apt-mark/seedbox deleted file mode 100644 index 37b941e..0000000 --- a/archived/buster/apt-mark/seedbox +++ /dev/null @@ -1,8 +0,0 @@ -# needed for rtorrent config setup -curl -# needed for torrenting -rtorrent -# needed for torrenting session -screen -# needed for upload/download -rsync diff --git a/archived/buster/apt-mark/user b/archived/buster/apt-mark/user deleted file mode 100644 index ece05a4..0000000 --- a/archived/buster/apt-mark/user +++ /dev/null @@ -1,77 +0,0 @@ -# to avoid booting problems with encrypted LVM, see -cryptsetup-initramfs -lvm2 -# this provides setupcon which reads /etc/default/console-setup -console-setup -# without this, systemd-logind won't run, and so not detect lid close for hibernation -dbus -# for wifi -wicd-curses -wicd-gtk -# for X to start at all -xserver-xorg-video-intel -# X input: keyboard and touchpad -xserver-xorg-input-evdev -xserver-xorg-input-synaptics -# for startx -xinit -# for xrdb -x11-xserver-utils -# for startx to run for non-root user -libpam-systemd -# window environment -i3 -i3status -suckless-tools -xterm -# to get sleepy at night -redshift -# for alsamixer -alsa-utils -# for xterm and browser unicode display -ttf-unifont -# also useful -vim -sudo -less -man-db -manpages -procps -# firefox dependencies -libdbus-glib-1-2 -libgtk-3-0 -# firefox installation dependencies (remove later?) -curl -python3 -bzip2 -wget -jq -unzip -# to mount encrypted USB stick and use its contents -pmount -cryptsetup -openssh-client -# for syncing -borgbackup -# emacs -emacs25 -emacs-common-non-dfsg -emacs-el -elpa-ledger -ledger -elpa-elfeed -# mail setup -isync -notmuch -elpa-notmuch -pinentry-gtk2 -# to mount Android phone -go-mtpfs -# to use HP Deskjet F380 scanner from GIMP -sane-utils -libsane-hpaio -xsane -# to use HP Deskjet F380 printer -cups -hplip -# diff --git a/archived/buster/apt-mark/website b/archived/buster/apt-mark/website deleted file mode 100644 index c046f50..0000000 --- a/archived/buster/apt-mark/website +++ /dev/null @@ -1,8 +0,0 @@ -# for gitweb -gitweb -fcgiwrap -# for plomlombot -gnupg -dirmngr -python3-venv -screen diff --git a/archived/buster/apt-mark/x200s b/archived/buster/apt-mark/x200s deleted file mode 100644 index e69de29..0000000 diff --git a/archived/buster/etc_files/all/etc/apt/sources.list b/archived/buster/etc_files/all/etc/apt/sources.list deleted file mode 100644 index 349e8a6..0000000 --- a/archived/buster/etc_files/all/etc/apt/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian buster main contrib non-free -deb http://deb.debian.org/debian-security/ buster/updates main contrib non-free -deb http://deb.debian.org/debian buster-updates main contrib non-free -deb http://ftp.debian.org/debian buster-backports main contrib non-free diff --git a/archived/buster/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx b/archived/buster/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx deleted file mode 100644 index 25c2d62..0000000 --- a/archived/buster/etc_files/dumpsite/etc/nginx/sites-available/dumpsite.nginx +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen 443 ssl; - server_name REPLACE_fqdn_ECALPER; - ssl_certificate /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/privkey.pem; - root /var/www-dump/; - - location /dump/ { - autoindex on; - } - - location /geheim/ { - auth_basic "geheim geheim"; - auth_basic_user_file /var/www-dump/password_geheim; - autoindex on; - } - - location /zettel/ { - # rewrite non-suffixed filenames to .html ones - rewrite ^(/zettel/(.*/)*[^./]+)$ $1.html; - autoindex on; - } - - location /uwsgi/ { - include uwsgi_params; - uwsgi_pass 127.0.0.1:3031; - } -} diff --git a/archived/buster/etc_files/eeepc/etc/systemd/logind.conf b/archived/buster/etc_files/eeepc/etc/systemd/logind.conf deleted file mode 100644 index 6a61f0b..0000000 --- a/archived/buster/etc_files/eeepc/etc/systemd/logind.conf +++ /dev/null @@ -1,8 +0,0 @@ -# This file is part of systemd. -# -# See logind.conf(5) for details. - -[Login] -# Note that with the standard Buster kernel this won't work due to -# . -HandleLidSwitch=hibernate diff --git a/archived/buster/etc_files/mail/etc/aliases b/archived/buster/etc_files/mail/etc/aliases deleted file mode 100644 index 5c52e6f..0000000 --- a/archived/buster/etc_files/mail/etc/aliases +++ /dev/null @@ -1,24 +0,0 @@ -# /etc/aliases -# maps whom what is sent to - -# As per RFC 2142. -mailer-daemon: plom -postmaster: plom -hostmaster: plom -usenet: plom -news: plom -webmaster: plom -www: plom -ftp: plom -abuse: plom -noc: plom -security: plom -root: plom - -# Personal aliases. -plomlompom: plom -christian.heller: plom -christian_heller: plom -christianheller: plom -c.heller: plom -heller: plom diff --git a/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-lmtp-sieve-filtering.conf b/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-lmtp-sieve-filtering.conf deleted file mode 100644 index eaf927b..0000000 --- a/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-lmtp-sieve-filtering.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This is only necessary when we use dovecot's LMTP mechanism to receive -# mail from postfix. -auth_username_format = %Ln - -# Add sieve filtering. -protocol lmtp { - mail_plugins = $mail_plugins sieve -} - -# We don't strictly need to provide a LMTP server to fetch mail from -# postfix, but we do if we want to do sophisticated stuff like sieve -# filtering on the way. -service lmtp { - inet_listener lmtp { - address = 127.0.0.1 - port = 2424 - } -} diff --git a/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-smtp-sasl.conf b/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-smtp-sasl.conf deleted file mode 100644 index d076d63..0000000 --- a/archived/buster/etc_files/mail/etc/dovecot/conf.d/99-smtp-sasl.conf +++ /dev/null @@ -1,10 +0,0 @@ -service auth { - unix_listener auth-userdb { - } - - unix_listener /var/spool/postfix/private/auth { - mode = 0660 - user = postfix - group = postfix - } -} diff --git a/archived/buster/etc_files/mail/etc/mailutils.conf b/archived/buster/etc_files/mail/etc/mailutils.conf deleted file mode 100644 index 44efe26..0000000 --- a/archived/buster/etc_files/mail/etc/mailutils.conf +++ /dev/null @@ -1,4 +0,0 @@ -# mailutils by default uses the FQDN as the mail domain name, fix this -address { - email-domain REPLACE_maildomain_ECALPER; -}; diff --git a/archived/buster/etc_files/mail/etc/nftables.conf b/archived/buster/etc_files/mail/etc/nftables.conf deleted file mode 100755 index 747d214..0000000 --- a/archived/buster/etc_files/mail/etc/nftables.conf +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/sbin/nft -f - -flush ruleset - -table inet filter { - chain input { - type filter hook input priority 0; policy drop; - iif lo accept comment "accept localhost traffic" - ct state invalid drop comment "drop invalid connections" - ct state established, related accept comment "accept traffic originated from us" - tcp dport 22 accept comment "accept SSH on default port" - tcp dport 25 accept comment "accept SMTP (allowing for STARTTLS); necessary for mail server to mail server banter, i.e. for receiving mails" - tcp dport 80 accept comment "accept HTTP; necessary for Certbot HTTP challenge" - tcp dport 465 accept comment "accept SMTPS; for mail user agent to mail server, i.e. for sending mails" - tcp dport 993 accept comment "accept IMAPS; for reading/downloading mails" - ip protocol icmp icmp type echo-request accept comment "accept ICMP for pinging" - } - chain forward { - type filter hook forward priority 0; policy drop; - } - chain output { - type filter hook output priority 0; policy accept; - } -} diff --git a/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.service b/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.service deleted file mode 100644 index dc8acb4..0000000 --- a/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run plom's fetchmail - -[Service] -Type=oneshot -User=plom -# fetchmail returns 1 when no new mail, we want to catch that -ExecStart=/bin/sh -c 'fetchmail || [ $? -eq 1 ]' diff --git a/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.timer b/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.timer deleted file mode 100644 index 0568eeb..0000000 --- a/archived/buster/etc_files/mail/etc/systemd/system/fetchmail_old_account.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run fetchmail once every minute - -[Timer] -OnCalendar=minutely - -[Install] -WantedBy=timers.target diff --git a/archived/buster/etc_files/mail/etc/systemd/system/pingmail.service b/archived/buster/etc_files/mail/etc/systemd/system/pingmail.service deleted file mode 100644 index e332114..0000000 --- a/archived/buster/etc_files/mail/etc/systemd/system/pingmail.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Run pingmail check - -[Service] -Type=oneshot -User=plom -ExecStart=/bin/sh -c '~/pingmail/pingmail check' diff --git a/archived/buster/etc_files/mail/etc/systemd/system/pingmail.timer b/archived/buster/etc_files/mail/etc/systemd/system/pingmail.timer deleted file mode 100644 index dba0c9f..0000000 --- a/archived/buster/etc_files/mail/etc/systemd/system/pingmail.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Run pingmail check once every hour - -[Timer] -OnCalendar=*-*-* *:00:00 - -[Install] -WantedBy=timers.target diff --git a/archived/buster/etc_files/old_server/etc/apt/sources.list b/archived/buster/etc_files/old_server/etc/apt/sources.list deleted file mode 100644 index a1fbdb0..0000000 --- a/archived/buster/etc_files/old_server/etc/apt/sources.list +++ /dev/null @@ -1,4 +0,0 @@ -deb http://deb.debian.org/debian stretch main contrib non-free -deb http://deb.debian.org/debian-security/ stretch/updates main contrib non-free -deb http://deb.debian.org/debian stretch-updates main contrib non-free -deb http://ftp.debian.org/debian stretch-backports main contrib non-free diff --git a/archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer b/archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer deleted file mode 100644 index 79a6e1e..0000000 --- a/archived/buster/etc_files/play/etc/systemd/system/encrypt_chatlogs.timer +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Attempt encryption of old chatlogs once every minute. - -[Timer] -OnCalendar=*-*-* *:*:00 - -[Install] -WantedBy=timers.target \ No newline at end of file diff --git a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html b/archived/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html deleted file mode 100644 index 8e2e67f..0000000 --- a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html +++ /dev/null @@ -1,4 +0,0 @@ -
-

Privacy: Visitor IP addresses are anonymized in the logs.

-

Contact: See plomlompom.com contact page.

-
diff --git a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt b/archived/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt deleted file mode 100644 index eb05362..0000000 --- a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: diff --git a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html b/archived/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html deleted file mode 100644 index 7268bac..0000000 --- a/archived/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html +++ /dev/null @@ -1 +0,0 @@ -This is plomlompom's personal single-user Pleroma instance. diff --git a/archived/buster/etc_files/server/etc/nftables.conf b/archived/buster/etc_files/server/etc/nftables.conf deleted file mode 100755 index efbc182..0000000 --- a/archived/buster/etc_files/server/etc/nftables.conf +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/sbin/nft -f - -flush ruleset - -table inet filter { - chain input { - type filter hook input priority 0; policy drop; - iif lo accept comment "accept localhost traffic" - ct state invalid drop comment "drop invalid connections" - ct state established, related accept comment "accept traffic originated from us" - tcp dport 22 accept comment "accept SSH on default port" - ip protocol icmp icmp type echo-request accept comment "accept ICMP for pinging" - } - chain forward { - type filter hook forward priority 0; policy drop; - } - chain output { - type filter hook output priority 0; policy accept; - } -} diff --git a/archived/buster/etc_files/server/etc/ssh/sshd_config b/archived/buster/etc_files/server/etc/ssh/sshd_config deleted file mode 100644 index 857962b..0000000 --- a/archived/buster/etc_files/server/etc/ssh/sshd_config +++ /dev/null @@ -1,124 +0,0 @@ -# $OpenBSD: sshd_config,v 1.103 2018/04/09 20:41:22 tj Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options override the -# default value. - -Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -#HostKey /etc/ssh/ssh_host_rsa_key -#HostKey /etc/ssh/ssh_host_ecdsa_key -#HostKey /etc/ssh/ssh_host_ed25519_key - -# Ciphers and keying -#RekeyLimit default none - -# Logging -#SyslogFacility AUTH -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -PermitRootLogin no # plomlompom's security rule -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#PubkeyAuthentication yes - -# Expect .ssh/authorized_keys2 to be disregarded by default in future. -#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 - -#AuthorizedPrincipalsFile none - -#AuthorizedKeysCommand none -#AuthorizedKeysCommandUser nobody - -# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! -#PasswordAuthentication yes -#PermitEmptyPasswords no - -# Change to yes to enable challenge-response passwords (beware issues with -# some PAM modules and threads) -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes -#KerberosGetAFSToken no - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes -#GSSAPIStrictAcceptorCheck yes -#GSSAPIKeyExchange no - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin yes -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -X11Forwarding yes -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PermitTTY yes -PrintMotd no -#PrintLastLog yes -#TCPKeepAlive yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS no -#PidFile /var/run/sshd.pid -#MaxStartups 10:30:100 -#PermitTunnel no -#ChrootDirectory none -#VersionAddendum none - -# no default banner path -#Banner none - -# Allow client to pass locale environment variables -AcceptEnv LANG LC_* - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# PermitTTY no -# ForceCommand cvs server - -ClientAliveInterval 120 -PasswordAuthentication no # plomlompom's security rule diff --git a/archived/buster/etc_files/user/etc/cups/printers.conf b/archived/buster/etc_files/user/etc/cups/printers.conf deleted file mode 100644 index 3475600..0000000 --- a/archived/buster/etc_files/user/etc/cups/printers.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Printer configuration file for CUPS v2.2.10 -# Written by cupsd -# DO NOT EDIT THIS FILE WHEN CUPSD IS RUNNING - -UUID urn:uuid:e856a26d-66f8-327a-4dca-0d8a09f87a25 -Info HP Deskjet F300 series -Location -MakeModel HP Deskjet f300 Series, hpcups 3.18.12 -DeviceURI hp:/usb/Deskjet_F300_series?serial=CN63VB21TM04KH -State Idle -Type 36892 -Accepting Yes -Shared No -JobSheets none none -QuotaPeriod 0 -PageLimit 0 -KLimit 0 -OpPolicy default -ErrorPolicy retry-job - diff --git a/archived/buster/etc_files/user/etc/default/console-setup b/archived/buster/etc_files/user/etc/default/console-setup deleted file mode 100644 index 090d241..0000000 --- a/archived/buster/etc_files/user/etc/default/console-setup +++ /dev/null @@ -1,4 +0,0 @@ -CHARMAP="UTF-8" -CODESET="Lat15" -FONTFACE="Terminus" -FONTSIZE="6x12" diff --git a/archived/buster/etc_files/user/opt/firefox/defaults/pref/autoconfig.js b/archived/buster/etc_files/user/opt/firefox/defaults/pref/autoconfig.js deleted file mode 100644 index cf8ea80..0000000 --- a/archived/buster/etc_files/user/opt/firefox/defaults/pref/autoconfig.js +++ /dev/null @@ -1,4 +0,0 @@ -// We set up AutoConfig according to , see firefox.cfg comments on why we need it -pref("general.config.filename", "firefox.cfg"); -pref("general.config.obscure_value", 0); - diff --git a/archived/buster/etc_files/user/opt/firefox/firefox.cfg b/archived/buster/etc_files/user/opt/firefox/firefox.cfg deleted file mode 100644 index b321153..0000000 --- a/archived/buster/etc_files/user/opt/firefox/firefox.cfg +++ /dev/null @@ -1,18 +0,0 @@ -// do not put any code into this first line, as it gets ignored by Firefox - -// we zero extensions.autoDisableScopes so our pre-installed extensions activate by default -pref("extensions.autoDisableScopes", 0); - -// we turn off annoying setup popups and pages; these settings are the result more of trial and error than thorough understanding by me, so more research might be warranted to discipline them -pref("startup.homepage_welcome_url", "file:///opt/firefox/blank.html"); -pref("browser.startup.homepage", "file:///opt/firefox/blank.html"); -pref("browser.startup.blankWindow", true); -pref("datareporting.policy.firstRunURL", ""); -pref("browser.shell.checkDefaultBrowser", false); -pref("datareporting.policy.dataSubmissionPolicyBypassNotification", true); - -// use socks proxy by default -pref("network.proxy.type", 1); -pref("network.proxy.socks", "localhost"); -pref("network.proxy.socks_port", 9999); -pref("network.proxy.remote_dns", true); diff --git a/archived/buster/etc_files/user/usr/share/applications/firefox.desktop b/archived/buster/etc_files/user/usr/share/applications/firefox.desktop deleted file mode 100644 index cb8d354..0000000 --- a/archived/buster/etc_files/user/usr/share/applications/firefox.desktop +++ /dev/null @@ -1,3 +0,0 @@ -[Desktop Entry] -Name=Firefox -Exec=/usr/local/bin/firefox %u diff --git a/archived/buster/etc_files/website/etc/nginx/sites-available/website.nginx b/archived/buster/etc_files/website/etc/nginx/sites-available/website.nginx deleted file mode 100644 index cbad304..0000000 --- a/archived/buster/etc_files/website/etc/nginx/sites-available/website.nginx +++ /dev/null @@ -1,40 +0,0 @@ -server { - listen 443 ssl; - server_name REPLACE_fqdn_ECALPER; - ssl_certificate /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/REPLACE_fqdn_ECALPER/privkey.pem; - root /var/www/html/; - index index.html index.htm index.nginx-debian.html; - - # serve /var/repos/* for HTTPS git cloning - location ~ /repos/clone(/.*) { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/lib/git-core/git-http-backend; - # Commented out so only repos are served that contain a - # git-daemon-export-ok file. - # fastcgi_param GIT_HTTP_EXPORT_ALL ""; - fastcgi_param GIT_PROJECT_ROOT /var/repos; - fastcgi_param PATH_INFO $1; - fastcgi_pass unix:/var/run/fcgiwrap.socket; - } - - # gitweb static files - location /repos/static/ { - alias /usr/share/gitweb/static/; - } - - # gitweb; this needs packages fcgiwrap and gitweb - location /repos/ { - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME /usr/share/gitweb/gitweb.cgi; - fastcgi_param GITWEB_CONFIG /etc/gitweb.conf; - fastcgi_pass unix:/var/run/fcgiwrap.socket; - } - - # login-protected IRC logs - location ~ ^/irclogs/([^/]+)/ { - auth_basic "$1 logs"; - auth_basic_user_file /var/www/irclogs_pw/$1; - autoindex on; - } -} diff --git a/archived/buster/etc_files/website/etc/systemd/system/plomlombot.service b/archived/buster/etc_files/website/etc/systemd/system/plomlombot.service deleted file mode 100644 index a4f6769..0000000 --- a/archived/buster/etc_files/website/etc/systemd/system/plomlombot.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=plomlombot screen - -[Service] -Type=simple -User=plom -ExecStart=/bin/sh -c '~/plomlombot_daemon.sh' -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/archived/buster/etc_files/x200s/etc/wicd/manager-settings.conf b/archived/buster/etc_files/x200s/etc/wicd/manager-settings.conf deleted file mode 100644 index de12c6c..0000000 --- a/archived/buster/etc_files/x200s/etc/wicd/manager-settings.conf +++ /dev/null @@ -1,24 +0,0 @@ -[Settings] -backend = external -wireless_interface = wls1 -wired_interface = enp0s25 -wpa_driver = wext -always_show_wired_interface = False -use_global_dns = False -global_dns_1 = None -global_dns_2 = None -global_dns_3 = None -global_dns_dom = None -global_search_dom = None -auto_reconnect = True -debug_mode = 0 -wired_connect_mode = 1 -signal_display_type = 0 -should_verify_ap = 1 -dhcp_client = 0 -link_detect_tool = 0 -flush_tool = 0 -sudo_app = 0 -prefer_wired = False -show_never_connect = True - diff --git a/archived/buster/etc_files/x220/etc/wicd/manager-settings.conf b/archived/buster/etc_files/x220/etc/wicd/manager-settings.conf deleted file mode 100644 index 985df76..0000000 --- a/archived/buster/etc_files/x220/etc/wicd/manager-settings.conf +++ /dev/null @@ -1,24 +0,0 @@ -[Settings] -backend = external -wireless_interface = wlp3s0 -wired_interface = enp0s25 -wpa_driver = wext -always_show_wired_interface = False -use_global_dns = False -global_dns_1 = None -global_dns_2 = None -global_dns_3 = None -global_dns_dom = None -global_search_dom = None -auto_reconnect = True -debug_mode = 0 -wired_connect_mode = 1 -signal_display_type = 0 -should_verify_ap = 1 -dhcp_client = 0 -link_detect_tool = 0 -flush_tool = 0 -sudo_app = 0 -prefer_wired = False -show_never_connect = True - diff --git a/archived/buster/home_files/eeepc/.config/i3status/config b/archived/buster/home_files/eeepc/.config/i3status/config deleted file mode 100644 index 207bef4..0000000 --- a/archived/buster/home_files/eeepc/.config/i3status/config +++ /dev/null @@ -1,82 +0,0 @@ -# plomlompom's i3 status bar configuration - -# Activate colors; set update interval of one second. -general { - colors = true - interval = 1 -} - -# Selection / order of status elements. -order += "disk /" -order += "disk /home/" -order += "wireless wlp2s0" -order += "ethernet enp1s0" -order += "battery 0" -order += "cpu_usage" -order += "load" -order += "cpu_temperature 0" -order += "time" -order += "volume master" - -# How much space is left in / ? -disk "/" { - format = "/: %avail of %total" - separator_block_width = 25 -} - -# How much space is left in /home/ ? -disk "/home/" { - format = "/home: %avail of %total" - separator_block_width = 25 -} - -# WLAN status: show IP and connection quality or "down". -wireless wlp2s0 { - format_up = "w: (%quality at %essid) %ip" - format_down = "w: down" - separator_block_width = 10 -} - -# Ethernet status: show IP or "down". -ethernet enp1s0 { - format_up = "e: %ip" - format_down = "e: down" - separator_block_width = 25 -} - -# Battery status: show FULL/CHARGING/BATTERY, storage, time left. -battery 0 { - format = "b: %status %percentage %remaining" - separator_block_width = 25 -} - -# Show CPU usage. -cpu_usage { - format = "cpu: %usage" - separator_block_width = 10 -} - -# Show system load during last 1/5/15 minutes. -load { - format = "%1min %5min %15min" - separator_block_width = 25 -} - -# Show CPU temperature in degrees of celsius. -cpu_temperature 0 { - format = "%degrees °C" - separator_block_width = 25 -} - -# Show date/time/timezone as "year-month-day hour:minute:second -# timezone_numeric/timezone_alphabetic". -time { - format = "%Y-%m-%d %H:%M:%S %z/%Z" - separator_block_width = 25 -} - -volume master { - format = "♪: %volume" - format_muted = "♪: muted (%volume)" - separator_block_width = 25 -} diff --git a/archived/buster/home_files/minimal/.bashrc b/archived/buster/home_files/minimal/.bashrc deleted file mode 100644 index 5ee9ad8..0000000 --- a/archived/buster/home_files/minimal/.bashrc +++ /dev/null @@ -1,26 +0,0 @@ -# Settings for interactive shells. - -# Fancy colors for ls. -alias ls="ls --color=auto" - -# Use vim as default editor for anything. -export VISUAL=vim -export EDITOR=$VISUAL - -# Colored prompt with username, hostname, date/time, directory. -colornumber=7 # Default to white if no color set via colornumber dotfile. -colornumber_file=~/.shell_prompt_color -if [ -f $colornumber_file ]; then - colornumber=`cat $colornumber_file` -fi -tput_color="$(tput setaf $colornumber)$(tput bold)" -tput_reset="$(tput sgr0)" -# Bash confuses the line length when not told to not count escape sequences. -if [ ! "$BASH" = "" ]; then - tput_color="\[$tput_color\]" - tput_reset="\[$tput_reset\]" -fi -PS1="${tput_color}["\$\(date\ +%Y-%m-%d/%H:%M:%S/%Z\)" $(whoami)@$(hostname):"\$\(pwd\)"]$ $tput_reset" -PS2="${tput_color}> $tput_reset" -PS3="${tput_color}select: $tput_reset" -PS4="${tput_color}+ $tput_reset" diff --git a/archived/buster/home_files/user/.config/i3/config b/archived/buster/home_files/user/.config/i3/config deleted file mode 100644 index 19c654e..0000000 --- a/archived/buster/home_files/user/.config/i3/config +++ /dev/null @@ -1,83 +0,0 @@ -# plomlompom's i3-wm configuration - -# Font for i3 text -font pango:Terminus 8px - -# Force "tabbed" as default layout for new windows. -workspace_layout tabbed - -# Make the Windows key the modifier key for all i3-wm actions. -set $mod Mod4 -floating_modifier $mod - -# Launch xterm. -bindsym $mod+Return exec xterm - -# Launch programs via dmenu. -bindsym $mod+d exec dmenu_run -bindsym $mod+x exec dmenu_run - -# Kill window. -bindsym $mod+Shift+Q kill - -# Move focus between windows. -bindsym $mod+Left focus left -bindsym $mod+Down focus down -bindsym $mod+Up focus up -bindsym $mod+Right focus right - -# Don't move focus with mouse. -focus_follows_mouse no - -# Move windows. -bindsym $mod+Shift+Left move left -bindsym $mod+Shift+Down move down -bindsym $mod+Shift+Up move up -bindsym $mod+Shift+Right move right - -# Resize windows -bindsym $mod+h resize shrink width 1 px or 1 ppt -bindsym $mod+l resize grow width 1 px or 1 ppt -bindsym $mod+j resize shrink height -bindsym $mod+k resize grow height - -# Toggle fullscreen for focused window. -bindsym $mod+f fullscreen - -# Toggle floating of window, focus on floating or tabbed windows. -bindsym $mod+Shift+space floating toggle -bindsym $mod+space focus mode_toggle - -# Switch to workspace x. -bindsym $mod+1 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 - -# Move window to workspace x. -bindsym $mod+Shift+exclam move workspace 1 -bindsym $mod+Shift+quotedbl move workspace 2 -bindsym $mod+Shift+section move workspace 3 -bindsym $mod+Shift+dollar move workspace 4 -bindsym $mod+Shift+percent move workspace 5 -bindsym $mod+Shift+ampersand move workspace 6 -bindsym $mod+Shift+slash move workspace 7 -bindsym $mod+Shift+parenleft move workspace 8 -bindsym $mod+Shift+parenright move workspace 9 -bindsym $mod+Shift+equal move workspace 10 - -# Reload i3 config file, restart (keeping sesion) i3, exit i3. -bindsym $mod+Shift+C reload -bindsym $mod+Shift+R restart -bindsym $mod+Shift+P exit - -# Select "i3status" as i3 status bar. -bar { - status_command i3status -} diff --git a/archived/buster/home_files/user/.emacs.d/init.el b/archived/buster/home_files/user/.emacs.d/init.el deleted file mode 100644 index fbec980..0000000 --- a/archived/buster/home_files/user/.emacs.d/init.el +++ /dev/null @@ -1,323 +0,0 @@ -;; general layout -;; ============== - -;; need no stinkin emacs help screen as start up, and no menu bar -(setq inhibit-startup-screen t) -(menu-bar-mode -1) - -;; highlight cursor line, parentheses -(global-hl-line-mode 1) -(show-paren-mode 1) - -;; show line numbers, use separator space -(global-linum-mode) -(setq linum-format "%d ") - -;; count cursor column, row in mode line -(setq column-number-mode t) - -;; settings to make GUI tolerable -(if window-system - (progn - (add-to-list 'default-frame-alist '(foreground-color . "white")) - (add-to-list 'default-frame-alist '(background-color . "black")) - (set-face-attribute 'default nil :height 80) - (scroll-bar-mode -1) - (setq visible-bell t) - (setq linum-format "%d"))) - -;; use as default browser what XDG offers -(setq-default browse-url-browser-function 'browse-url-xdg-open) - - - -;; general keybindings -;; =================== - -;; create and use a minimal global map using just the self-insert command -;; bindings and a selection of some to me very common keystrokes -(setq minimal-map (make-sparse-keymap)) -(substitute-key-definition 'self-insert-command 'self-insert-command - minimal-map global-map) -(use-global-map minimal-map) -(global-set-key (kbd "DEL") 'backward-delete-char-untabify) -(global-set-key (kbd "RET") 'newline) -(global-set-key (kbd "TAB") 'indent-for-tab-command) -(global-set-key (kbd "") 'previous-line) -(global-set-key (kbd "") 'next-line) -(global-set-key (kbd "") 'left-char) -(global-set-key (kbd "") 'right-char) -(global-set-key (kbd "") 'scroll-down-command) -(global-set-key (kbd "") 'scroll-up-command) -(global-set-key (kbd "M-x") 'execute-extended-command) -(global-set-key (kbd "C-g") 'keyboard-quit) -;(global-set-key (kbd "") 'kmacro-start-macro-or-insert-counter) -;(global-set-key (kbd "") 'kmacro-end-or-call-macro) -;; note how to switch back to the original map: (use-global-map global-map) -(setq shr-map (make-sparse-keymap)) ; got annoying in elfeed-show on URLs - - - -;; minibuffer -;; ========== - -;; incremental minibuffer completion -(icomplete-mode 1) - - - -;; text editing -;; ============ - -;; tabs are evil -(setq-default indent-tabs-mode nil) -(setq-default tab-width 4) -(setq indent-line-function 'insert-tab) - -;; show trailing whitespace -(setq-default show-trailing-whitespace 1) - -;; on save, ask whether to ensure text file's last line ends in a -;; newline character -(setq require-final-newline 1) - -;; use dedicated directory for version-controlled, endless backups; -;; never delete old versions -(setq make-backup-files t - backup-directory-alist `(("." . "~/.emacs_backups")) - backup-by-copying t - version-control t - delete-old-versions 1) ;; neither t nor nil: never delete - - -;; package management -;; ================== - -;; where we get packages from -(setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/") - ("melpa-unstable" . "https://melpa.org/packages/") - ("melpa-stable" . "https://stable.melpa.org/packages/"))) - -;; ensure certain packages are installed (actually, we use Debian repos here) -;; credit to -;(setq package-list '(elfeed ledger-mode)) -;(package-initialize) -;(dolist (package package-list) -; (unless (package-installed-p package) -; (package-install package))) - - - -;;; window management -;;; ================= -; -;;; track window configurations to allow window config undo -;(winner-mode 1) - - - -;; mail setup -;; ========== - -(setq send-mail-function 'smtpmail-send-it) -(setq smtpmail-smtp-server "mail.plomlompom.com") -(setq smtpmail-smtp-service 465) -(setq smtpmail-stream-type 'ssl) -(setq smtpmail-smtp-user "plom") -(setq mml-secure-openpgp-encrypt-to-self t) -(add-hook 'message-setup-hook 'mml-secure-sign-pgpmime) - -;(setq gnutls-log-level 0) - -;; if we don't set this, we get this warning: -;; gnutls.c: [1] Note that the security level of the Diffie-Hellman key exchange -;; has been lowered to 256 bits and this may allow decryption of the session data -(setq gnutls-min-prime-bits 1024) - -;; there is a WEIRD bug somewhere in /network-stream-open-tls/ that disappears the -;; stream process, seemingly unless the /message/ function is called at the right -;; place (earliest in /nsm-verify-connection/ right before the "cond" there, latest -;; in /network-stream-get-response/ right after "(goto-char start)"; this works -;; unless /inhibit_message/ is set, indicating that writing to the *Messages* -;; buffer is not relevant, but maybe writing to the echo area is); activing the -;; gnutls logging is just a hack to achieve such calls to /message/ in the -;; /network-stream-open-tls/ flow. -(setq gnutls-log-level 1) ; miraculously makes smtpmail work - -;; constructs From: domain if mail composer directly called (from without -;; notmuch), but we don't actually intend to do that -;(setq mail-host-address "plomlompom.com") - -;; otherwise notmuch becomes extremely slow in some cases -(setq-default notmuch-show-indent-content nil) - -;; this only works if we use notmuch-mua-send instead of message-send -(setq notmuch-fcc-dirs '(("plom@plomlompom.com" . "maildir/Sent"))) - -;; this gets rid of "i-did-not-set--mail-host-address--so-tickle-me" -;; in the message ID -(setq mail-host-address "plomlompom.com") - -;; notmuch saved searches -(setq notmuch-saved-searches - '((:name "inbox" :query "tag:unread and folder:inbox") - (:name "all" :query "tag:unread not folder:maildir/Trash") - (:name "plomlompom.de" :query "tag:unread and folder:maildir/plomlompom.de") - (:name "nebenan" :query "tag:unread and folder:maildir/nebenan") - (:name "reflect-info" :query "tag:unread and folder:maildir/reflect-info") - (:name "gmail" :query "tag:unread and folder:maildir/gmail.com") - (:name "mutter" :query "tag:unread and folder:maildir/mutter"))) - - - -;; org mode -;; ======== - -;; unsure why, but to re-set the key map, we not only have to explicitely do it -;; only after org-mode loading, but also have to explicitely overwrite the -;; C-c keybinding; TODO: investigate -(with-eval-after-load 'org - (setq org-mode-map (make-sparse-keymap)) - (define-key org-mode-map (kbd "C-c") nil) - (define-key org-mode-map (kbd "TAB") 'org-cycle) - (define-key org-mode-map (kbd "") 'org-shifttab)) - -;; don't truncate lines by default -(setq org-startup-truncated nil) - -;; basic org-capture config -(setq org-capture-templates - '(("x" "test" plain (file "~/org/notes.org") "%T: %?"))) -(add-hook 'org-capture-mode-hook 'evil-insert-state) - -;; agenda view on startup -(load-library "find-lisp") -(setq org-agenda-files (find-lisp-find-files "~/org" "\.org$")) -(setq org-agenda-span 90) -(setq org-agenda-use-time-grid nil) -(add-hook 'emacs-startup-hook (lambda () - (org-agenda-list) - (switch-to-buffer "*Org Agenda*") - (other-window 1))) - -;;; for calendar, use ISO date style -;(setq calendar-date-style 'iso) -;(setq diary-number-of-entries 7) -;(diary) -;(setq org-agenda-time-grid '((today require-timed remove-match) -; #("----------------" 0 16 (org-heading t)) -; (0 200 400 600 800 1000 1200 -; 1400 1600 1800 2000 2200))) - -;; empty org-agenda-mode keybindings -(add-hook 'org-agenda-mode-hook - (lambda () - (setq org-agenda-mode-map (make-sparse-keymap)))) -(add-hook 'org-agenda-mode-hook - (lambda () - (use-local-map (make-sparse-keymap)))) - -;; org-publish-all -(setq org-publish-project-alist - '( - ("website" - :base-directory "~/org/web/" - :base-extension "org" - :publishing-directory "~/html/" - :recursive t - :publishing-function org-html-publish-to-html - :headline-levels 4 ; Just the default for this project. - :auto-preamble t - ))) - -;; use [ki:] syntax to hide stuff from exports -(defun classify-information (text backend info) - "Replaces '[ki:WHATEVER]' with '[klassifizierte Information]'." - (replace-regexp-in-string "\\[ki:[^\]]*\]" "[klassifizierte Information]" text)) -(add-hook 'org-export-filter-plain-text-functions 'classify-information) - -;; add HTML validator link to exports -(setq org-html-validation-link "Validate") - - - -;;; Info mode -;;; ========= - -(setq Info-mode-map (make-sparse-keymap)) -(define-key Info-mode-map (kbd "RET") 'Info-follow-nearest-node) -(define-key Info-mode-map (kbd "u") 'Info-up) -(define-key Info-mode-map (kbd "TAB") 'Info-next-reference) -(define-key Info-mode-map (kbd "") 'Info-prev-reference) -(define-key Info-mode-map (kbd "H") 'Info-history-back) -(define-key Info-mode-map (kbd "L") 'Info-history-forward) -(define-key Info-mode-map (kbd "I") 'Info-goto-node) -(define-key Info-mode-map (kbd "i") 'Info-index) - - - -;; help mode -;; ========= - -(setq help-mode-map (make-sparse-keymap)) -(define-key help-mode-map (kbd "TAB") 'forward-button) -(define-key help-mode-map (kbd "RET") 'help-follow) -(define-key help-mode-map (kbd "") 'backward-button) - - - -;; elfeed -;; ====== - -(require 'elfeed) ; needed so we can set the font faces -(set-face-background 'elfeed-search-title-face "magenta") -(set-face-background 'elfeed-search-unread-count-face "magenta") -(setq elfeed-feeds - '("https://capsurvival.blogspot.com/feeds/posts/default" - "https://jungle.world/rss.xml" - "http://news.dieweltistgarnichtso.net/bin/index.xml" - "https://taz.de/!s=&ExportStatus=Intern&SuchRahmen=Online;rss/" - "http://www.tagesschau.de/xml/atom")) -(setq elfeed-search-mode-map (make-sparse-keymap)) -(define-key elfeed-search-mode-map (kbd "RET") 'elfeed-search-show-entry) -(defun elfeed-search-mark-as-read() (interactive) - (elfeed-search-untag-all 'unread)) -(define-key elfeed-search-mode-map (kbd "r") 'elfeed-search-mark-as-read) -(define-key elfeed-search-mode-map (kbd "R") 'elfeed-search-tag-all-unread) -(define-key elfeed-search-mode-map (kbd "f") 'elfeed-search-live-filter) -(define-key elfeed-search-mode-map (kbd "u") 'elfeed-update) -(setq elfeed-show-mode-map (make-sparse-keymap)) -(define-key elfeed-show-mode-map (kbd "u") 'elfeed) -(define-key elfeed-show-mode-map (kbd "TAB") 'shr-next-link) -(define-key elfeed-show-mode-map (kbd "") 'shr-previous-link) -(define-key elfeed-show-mode-map (kbd "a") 'elfeed-show-prev) -(define-key elfeed-show-mode-map (kbd "d") 'elfeed-show-next) -(define-key elfeed-show-mode-map (kbd "y") 'shr-copy-url) -(define-key elfeed-show-mode-map (kbd "RET") 'shr-browse-url) - - - -;; eww -;; === - -(setq eww-mode-map (make-sparse-keymap)) -(define-key eww-mode-map (kbd "TAB") 'shr-next-link) -(define-key eww-mode-map (kbd "") 'shr-previous-link) -(define-key eww-mode-map (kbd "H") 'eww-back-url) -(define-key eww-mode-map (kbd "L") 'eww-forward-url) - - - -;; ledger -;; ====== -(setq ledger-mode-map (make-sparse-keymap)) -(define-key ledger-mode-map (kbd "TAB") 'ledger-magic-tab) - - - -;;; plomvi mode -;;; =========== - -(defvar plomvi-return-combo (kbd "C-c")) -(load "~/public_repos/plomvi.el/plomvi.el") -(plomvi-global-mode 1) diff --git a/archived/buster/home_files/x200s/.config/i3status/config b/archived/buster/home_files/x200s/.config/i3status/config deleted file mode 100644 index 256f174..0000000 --- a/archived/buster/home_files/x200s/.config/i3status/config +++ /dev/null @@ -1,82 +0,0 @@ -# plomlompom's i3 status bar configuration - -# Activate colors; set update interval of one second. -general { - colors = true - interval = 1 -} - -# Selection / order of status elements. -order += "disk /" -order += "disk /home/" -order += "wireless wls1" -order += "ethernet enp0s25" -order += "battery 0" -order += "cpu_usage" -order += "load" -order += "cpu_temperature 0" -order += "time" -order += "volume master" - -# How much space is left in / ? -disk "/" { - format = "/: %avail available of %total" - separator_block_width = 25 -} - -# How much space is left in /home ? -disk "/home/" { - format = "/home: %avail available of %total" - separator_block_width = 25 -} - -# WLAN status: show IP and connection quality or "down". -wireless wls1 { - format_up = "w: (%quality at %essid) %ip" - format_down = "w: down" - separator_block_width = 10 -} - -# Ethernet status: show IP or "down". -ethernet enp0s25 { - format_up = "e: %ip" - format_down = "e: down" - separator_block_width = 25 -} - -# Battery status: show FULL/CHARGING/BATTERY, storage, time left. -battery 0 { - format = "b: %status %percentage %remaining" - separator_block_width = 25 -} - -# Show CPU usage. -cpu_usage { - format = "cpu: %usage" - separator_block_width = 10 -} - -# Show system load during last 1/5/15 minutes. -load { - format = "%1min %5min %15min" - separator_block_width = 25 -} - -# Show CPU temperature in degrees of celsius. -cpu_temperature 0 { - format = "%degrees °C" - separator_block_width = 25 -} - -# Show date/time/timezone as "year-month-day hour:minute:second -# timezone_numeric/timezone_alphabetic". -time { - format = "%Y-%m-%d %H:%M:%S %z/%Z" - separator_block_width = 25 -} - -volume master { - format = "♪: %volume" - format_muted = "♪: muted (%volume)" - separator_block_width = 25 -} diff --git a/archived/buster/other_files/append_opendkim.conf b/archived/buster/other_files/append_opendkim.conf deleted file mode 100644 index ee5dc14..0000000 --- a/archived/buster/other_files/append_opendkim.conf +++ /dev/null @@ -1,6 +0,0 @@ - -# plomlompom customizations -Domain REPLACE_maildomain_ECALPER -KeyFile /etc/dkimkeys/REPLACE_selector_ECALPER.private -Selector REPLACE_selector_ECALPER -Socket inet:8892@localhost diff --git a/archived/buster/other_files/append_pleroma_config b/archived/buster/other_files/append_pleroma_config deleted file mode 100644 index 54a65d0..0000000 --- a/archived/buster/other_files/append_pleroma_config +++ /dev/null @@ -1,24 +0,0 @@ - -########################################## -# below this: customizations by plomlompom - -config :pleroma, :instance, - registrations_open: false, - safe_dm_mentions: true, - cleanup_attachments: true - -config :pleroma, :frontend_configurations, - pleroma_fe: %{ - showInstanceSpecificPanel: true, - background: "/pixel.png", - logo: "/pixel.png" - } - -config :pleroma, :chat, - enabled: false - -config :pleroma, Pleroma.Captcha, - enabled: false - -config :pleroma, :static_fe, - enabled: true diff --git a/archived/buster/other_files/append_postfix_main.cf b/archived/buster/other_files/append_postfix_main.cf deleted file mode 100644 index 385058c..0000000 --- a/archived/buster/other_files/append_postfix_main.cf +++ /dev/null @@ -1,23 +0,0 @@ - -# TLS certs -smtpd_tls_cert_file=/etc/letsencrypt/live/${myhostname}/fullchain.pem -smtpd_tls_key_file=/etc/letsencrypt/live/${myhostname}/privkey.pem - -# OpenDKIM milter -non_smtpd_milters = inet:localhost:8892 -smtpd_milters = inet:localhost:8892 - -# transport mail to dovecot; not strictly needed, as even without this -# postfix will throw mail to /var/mail/USER to be found by dovecot for -# serving via IMAP etc.; but using dovecot's LMTP server for delivery -# allows us to do stuff like dovecot-side sieve filtering. -mailbox_transport = lmtp:inet:127.0.0.1:2424 - -# to authenticate on SMTP, we need a SASL mechanism; we talk to dovecot -# for this, since it provides one -smtpd_sasl_type = dovecot -smtpd_sasl_path = private/auth -smtpd_sasl_auth_enable = yes - -# we append mail domain here for if it is different than $myhostname -mydestination = $myhostname localhost.$mydomain localhost REPLACE_maildomain_ECALPER diff --git a/archived/buster/other_files/append_postfix_master.cf b/archived/buster/other_files/append_postfix_master.cf deleted file mode 100644 index 5d1aa3c..0000000 --- a/archived/buster/other_files/append_postfix_master.cf +++ /dev/null @@ -1,4 +0,0 @@ - -# Run SMTPS on port 465, enforce TLS there. -smtps inet n - y - - smtpd - -o smtpd_tls_wrappermode=yes diff --git a/archived/buster/other_files/dovecot.sieve b/archived/buster/other_files/dovecot.sieve deleted file mode 100644 index 5346309..0000000 --- a/archived/buster/other_files/dovecot.sieve +++ /dev/null @@ -1,8 +0,0 @@ -require ["fileinto"]; -require ["mailbox"]; -if address :is "from" "foo@bar.com" { - fileinto :create "foo"; -} -if address :is :domain "to" "example.com" { - fileinto :create "example.com"; -} diff --git a/archived/buster/other_files/fetchmailrc b/archived/buster/other_files/fetchmailrc deleted file mode 100755 index b437563..0000000 --- a/archived/buster/other_files/fetchmailrc +++ /dev/null @@ -1,2 +0,0 @@ -# remove "keep" if you're sure about your setup; it keeps mails on server from getting deleted -poll mail.example.com protocol pop3 username "foo@example.com" password "PASSWORD" ssl keep diff --git a/archived/buster/other_files/peertube_production.yaml b/archived/buster/other_files/peertube_production.yaml deleted file mode 100644 index 86804e2..0000000 --- a/archived/buster/other_files/peertube_production.yaml +++ /dev/null @@ -1,375 +0,0 @@ -listen: - hostname: 'localhost' - port: 9000 - -# Correspond to your reverse proxy server_name/listen configuration -webserver: - https: true - hostname: 'example.com' - port: 443 - -rates_limit: - api: - # 50 attempts in 10 seconds - window: 10 seconds - max: 50 - login: - # 15 attempts in 5 min - window: 5 minutes - max: 15 - signup: - # 2 attempts in 5 min (only succeeded attempts are taken into account) - window: 5 minutes - max: 2 - ask_send_email: - # 3 attempts in 5 min - window: 5 minutes - max: 3 - -# Proxies to trust to get real client IP -# If you run PeerTube just behind a local proxy (nginx), keep 'loopback' -# If you run PeerTube behind a remote proxy, add the proxy IP address (or subnet) -trust_proxy: - - 'loopback' - -# Your database name will be "peertube"+database.suffix -database: - password: 'peertube' - hostname: 'localhost' - port: 5432 - suffix: '_prod' - username: 'peertube' - pool: - max: 5 - -# Redis server for short time storage -# You can also specify a 'socket' path to a unix socket but first need to -# comment out hostname and port -redis: - hostname: 'localhost' - port: 6379 - auth: null - db: 0 - -# SMTP server to send emails -smtp: - hostname: null - port: 465 # If you use StartTLS: 587 - username: null - password: null - tls: true # If you use StartTLS: false - disable_starttls: false - ca_file: null # Used for self signed certificates - from_address: 'admin@example.com' - -email: - body: - signature: "PeerTube" - subject: - prefix: "[PeerTube]" - -# From the project root directory -storage: - tmp: '/var/www/peertube/storage/tmp/' # Use to download data (imports etc), store uploaded files before processing... - avatars: '/var/www/peertube/storage/avatars/' - videos: '/var/www/peertube/storage/videos/' - streaming_playlists: '/var/www/peertube/storage/streaming-playlists/' - redundancy: '/var/www/peertube/storage/redundancy/' - logs: '/var/www/peertube/storage/logs/' - previews: '/var/www/peertube/storage/previews/' - thumbnails: '/var/www/peertube/storage/thumbnails/' - torrents: '/var/www/peertube/storage/torrents/' - captions: '/var/www/peertube/storage/captions/' - cache: '/var/www/peertube/storage/cache/' - plugins: '/var/www/peertube/storage/plugins/' - -log: - level: 'info' # debug/info/warning/error - rotation: - enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate - maxFileSize: 12MB - maxFiles: 20 - anonymizeIP: true - -search: - # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance - # If enabled, the associated group will be able to "escape" from the instance follows - # That means they will be able to follow channels, watch videos, list videos of non followed instances - remote_uri: - users: true - anonymous: false - -trending: - videos: - interval_days: 7 # Compute trending videos for the last x days - -# Cache remote videos on your server, to help other instances to broadcast the video -# You can define multiple caches using different sizes/strategies -# Once you have defined your strategies, choose which instances you want to cache in admin -> manage follows -> following -redundancy: - videos: - check_interval: '1 hour' # How often you want to check new videos to cache - strategies: # Just uncomment strategies you want -# - -# size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'most-views' # Cache videos that have the most views -# - -# size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'trending' # Cache trending videos -# - -# size: '10GB' -# # Minimum time the video must remain in the cache. Only accept values > 10 hours (to not overload remote instances) -# min_lifetime: '48 hours' -# strategy: 'recently-added' # Cache recently added videos -# min_views: 10 # Having at least x views - -csp: - enabled: false - report_only: true # CSP directives are still being tested, so disable the report only mode at your own risk! - report_uri: - -tracker: - # If you disable the tracker, you disable the P2P aspect of PeerTube - enabled: true - # Only handle requests on your videos. - # If you set this to false it means you have a public tracker. - # Then, it is possible that clients overload your instance with external torrents - private: true - # Reject peers that do a lot of announces (could improve privacy of TCP/UDP peers) - reject_too_many_announces: false - -history: - videos: - # If you want to limit users videos history - # -1 means there is no limitations - # Other values could be '6 months' or '30 days' etc (PeerTube will periodically delete old entries from database) - max_age: -1 - -views: - videos: - # PeerTube creates a database entry every hour for each video to track views over a period of time - # This is used in particular by the Trending page - # PeerTube could remove old remote video views if you want to reduce your database size (video view counter will not be altered) - # -1 means no cleanup - # Other values could be '6 months' or '30 days' etc (PeerTube will periodically delete old entries from database) - remote: - max_age: -1 - -plugins: - # The website PeerTube will ask for available PeerTube plugins and themes - # This is an unmoderated plugin index, so only install plugins/themes you trust - index: - enabled: true - check_latest_versions_interval: '12 hours' # How often you want to check new plugins/themes versions - url: 'https://packages.joinpeertube.org' - - -############################################################################### -# -# From this point, all the following keys can be overridden by the web interface -# (local-production.json file). If you need to change some values, prefer to -# use the web interface because the configuration will be automatically -# reloaded without any need to restart PeerTube. -# -# /!\ If you already have a local-production.json file, the modification of the -# following keys will have no effect /!\. -# -############################################################################### - -cache: - previews: - size: 500 # Max number of previews you want to cache - captions: - size: 500 # Max number of video captions/subtitles you want to cache - -admin: - # Used to generate the root user at first startup - # And to receive emails from the contact form - email: 'admin@example.com' - -contact_form: - enabled: true - -signup: - enabled: false - limit: 10 # When the limit is reached, registrations are disabled. -1 == unlimited - requires_email_verification: false - filters: - cidr: # You can specify CIDR ranges to whitelist (empty = no filtering) or blacklist - whitelist: [] - blacklist: [] - -user: - # Default value of maximum video BYTES the user can upload (does not take into account transcoded files). - # -1 == unlimited - video_quota: -1 - video_quota_daily: -1 - -# If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag -# In addition, if some resolutions are enabled the mp4 video file will be transcoded to these new resolutions. -# Please, do not disable transcoding since many uploaded videos will not work -transcoding: - enabled: true - # Allow your users to upload .mkv, .mov, .avi, .flv videos - allow_additional_extensions: true - # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file - allow_audio_files: true - threads: 1 - resolutions: # Only created if the original video has a higher resolution, uses more storage! - 0p: false # audio-only (creates mp4 without video stream, always created when enabled) - 240p: true - 360p: true - 480p: true - 720p: true - 1080p: true - 2160p: false - - # Generate videos in a WebTorrent format (what we do since the first PeerTube release) - # If you also enabled the hls format, it will multiply videos storage by 2 - # If disabled, breaks federation with PeerTube instances < 2.1 - webtorrent: - enabled: true - - # /!\ Requires ffmpeg >= 4.1 - # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: - # * Resolution change is smoother - # * Faster playback in particular with long videos - # * More stable playback (less bugs/infinite loading) - # If you also enabled the webtorrent format, it will multiply videos storage by 2 - hls: - enabled: true - -import: - # Add ability for your users to import remote videos (from YouTube, torrent...) - videos: - http: # Classic HTTP or all sites supported by youtube-dl https://rg3.github.io/youtube-dl/supportedsites.html - enabled: false - # You can use an HTTP/HTTPS/SOCKS proxy with youtube-dl - proxy: - enabled: false - url: "" - torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) - enabled: false - -auto_blacklist: - # New videos automatically blacklisted so moderators can review before publishing - videos: - of_users: - enabled: false - -# Instance settings -instance: - name: 'PlomTube' - short_description: '' - description: 'Personal PeerTube instance by plomlompom (see https://plomlompom.com) for his own videos.' # Support markdown - terms: '**Privacy**: Videos here are streamed via the BitTorrent protocol, which might expose your IP to other peers – see the "P2P & Privacy" section [here](/about/peertube). Internally, site visits are logged by the PeerTube software, but with IPs anonymized. **Contact**: See https://plomlompom.com/contact.html' # Support markdown - code_of_conduct: '' # Supports markdown - - # Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc - moderation_information: '' # Supports markdown - - # Why did you create this instance? - creation_reason: '' - - # Who is behind the instance? A single person? A non profit? - administrator: '' - - # How long do you plan to maintain this instance? - maintenance_lifetime: '' - - # How will you pay the PeerTube instance server? With your own funds? With users donations? Advertising? - business_model: '' - - # If you want to explain on what type of hardware your PeerTube instance runs - # Example: "2 vCore, 2GB RAM..." - hardware_information: '' # Supports Markdown - - # What are the main languages of your instance? To interact with your users for example - # Uncomment or add the languages you want - # List of supported languages: https://peertube.cpy.re/api/v1/videos/languages - languages: -# - en -# - es -# - fr - - # You can specify the main categories of your instance (dedicated to music, gaming or politics etc) - # Uncomment or add the category ids you want - # List of supported categories: https://peertube.cpy.re/api/v1/videos/categories - categories: -# - 1 # Music -# - 2 # Films -# - 3 # Vehicles -# - 4 # Art -# - 5 # Sports -# - 6 # Travels -# - 7 # Gaming -# - 8 # People -# - 9 # Comedy -# - 10 # Entertainment -# - 11 # News & Politics -# - 12 # How To -# - 13 # Education -# - 14 # Activism -# - 15 # Science & Technology -# - 16 # Animals -# - 17 # Kids -# - 18 # Food - - default_client_route: '/videos/trending' - - # Whether or not the instance is dedicated to NSFW content - # Enabling it will allow other administrators to know that you are mainly federating sensitive content - # Moreover, the NSFW checkbox on video upload will be automatically checked by default - is_nsfw: false - # By default, "do_not_list" or "blur" or "display" NSFW videos - # Could be overridden per user with a setting - default_nsfw_policy: 'do_not_list' - - customizations: - javascript: '' # Directly your JavaScript code (without