X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;f=jessie_postinstall.sh;h=0b628e520d87425aea8106a8e060efea46042dc4;hb=044b3d25fa674a332cf9a9ea2f7083be56cd3060;hp=1ddd016d12187c90d37c5a68d575e993da2744e1;hpb=01476319c981ff7a8eefcf1e91d5407495426a61;p=config
diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 1ddd016..0b628e5 100755
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -26,9 +26,9 @@ if [ "$3" = "plomlompom.com" ]; then
elif [ "$3" = "test.plomlompom.com" ]; then
hostname="test.plomlompom"
elif [ "$2" = "public" ]; then
- hostname="twtxt.plomlompom"
+ hostname="htwtxt.plomlompom"
elif [ "$2" = "X200s" ]; then
- hostname="X220s"
+ hostname="X200s"
elif [ "$2" = "T450s" ]; then
hostname="T450s"
fi
@@ -118,6 +118,10 @@ if [ "$1" = "thinkpad" ]; then
'#START_CHARGE_THRESH_BAT0/' /etc/default/tlp
sed -i 's/^#STOP_CHARGE_THRESH_BAT0/STOP_CHARGE_THRESH_BAT0=95 '\
'#STOP_CHARGE_THRESH_BAT0/' /etc/default/tlp
+ sed -i 's/^#START_CHARGE_THRESH_BAT1/START_CHARGE_THRESH_BAT0=10 '\
+'#START_CHARGE_THRESH_BAT1/' /etc/default/tlp
+ sed -i 's/^#STOP_CHARGE_THRESH_BAT1/STOP_CHARGE_THRESH_BAT0=95 '\
+'#STOP_CHARGE_THRESH_BAT1/' /etc/default/tlp
sed -i 's/^#DEVICES_TO_DISABLE_ON_STARTUP/DEVICES_TO_DISABLE_ON_STARTUP='\
'"bluetooth wifi wwan" #DEVICES_TO_DISABLE_ON_STARTUP/' /etc/default/tlp
tlp start
@@ -192,7 +196,7 @@ if [ "$1" = "server" ]; then
newaliases
service postfix restart
if [ "$2" = "personal" ]; then
- apt-get -y install getmail4 procmail
+ apt-get -y install getmail4 procmail
fi
# Set up regular system update reminder.
@@ -225,7 +229,6 @@ if [ "$1" = "server" ]; then
su - plom -c 'git clone https://github.com/plomlompom/htwtxt $GOPATH/src/htwtxt'
su - plom -c 'go get htwtxt'
path=`su - plom -c 'echo $GOPATH/bin/htwtxt'`
- #setcap 'cap_net_bind_service=+ep' $path
su - plom -c 'mkdir -p ~/htwtxt'
cp config/systemfiles/htwtxt_restart_reminder.service \
/etc/systemd/system/htwtxt_restart_reminder.service
@@ -252,6 +255,28 @@ if [ "$1" = "server" ]; then
touch /var/www/password_irclogs_zrolaps
ln -s /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/657eea42f86866f2954d39f92a6c71ff/logs/ /var/www/html/irclogs/nodrama.de
touch /var/www/password_irclogs_nodrama_de
+ ln -s /home/plom/plomlombot_db/6f322d574618816aa2d6d1ceb4fd2551/a083c5d5efca3734294fa656692990b6/logs/ /var/www/html/irclogs/freakazoid
+ touch /var/www/password_irclogs_freakazoid
+
+ # Set up other web-served directories.
+ su - plom -c 'mkdir -p /home/plom/dump'
+ ln -s /home/plom/dump/ /var/www/html/dump
+ su - plom -c 'mkdir -p /home/plom/geheim'
+ ln -s /home/plom/geheim/ /var/www/html/geheim
+ su - plom -c 'mkdir -p /home/plom/lesekreis'
+ ln -s /home/plom/geheim/ /var/www/html/lesekreis
+ su - plom -c 'mkdir -p /home/plom/zettel'
+ ln -s /home/plom/zettel/ /var/www/html/zettel
+ su - plom -c 'git init --bare /home/plom/zettel.git'
+ su - plom -c 'cp ~/config/systemfiles/post-update ~/zettel.git/hooks/'
+ su - plom -c 'chmod a+x /home/plom/zettel.git/hooks/post-update'
+
+ # Install website generator tools
+ apt-get -y install pandoc wget
+ wget http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz
+ tar -oxzf redo-sh.tar.gz -C /usr/local
+ rm redo-sh.tar.gz
+ apt-get --purge autoremove wget
fi
elif [ "$1" = "thinkpad" ]; then
@@ -294,7 +319,7 @@ elif [ "$1" = "thinkpad" ]; then
apt-get -y install x11-xserver-utils
# Set up pentadactyl.
- apt-get -y install iceweasel
+ apt-get -y install iceweasel xul-ext-noscript
apt-get -y -t jessie-backports install xul-ext-pentadactyl
apt-get -y install vim-gtk
su plom -c 'mkdir -p /home/plom/downloads/'
@@ -310,4 +335,4 @@ passwd plom
rm jessie_postinstall.sh
# Finalize everything with a reboot.
-echo 'You may reboot now with the "reboot" command unless there's more to do.'
+echo "You may reboot now with the 'reboot' command unless there's more to do."