X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=jessie_start_server.sh;h=76a9bda58a0a73e777f55c0a3b627c0e1a0787fe;hb=82f076e2dd877f185330864a6ebbe6407717dbb1;hp=e58f76093c1da0ef02ff95fad17f75af5d5f742e;hpb=76537b041c4aae17ed4b30580f3a41d2248a91f2;p=config

diff --git a/jessie_start_server.sh b/jessie_start_server.sh
index e58f760..76a9bda 100755
--- a/jessie_start_server.sh
+++ b/jessie_start_server.sh
@@ -69,13 +69,14 @@ locale-gen
 apt-get -y install ca-certificates
 apt-get -y install git
 git clone http://github.com/plomlompom/config
-config/symlink.sh
+config/bin/symlink.sh
 
 # Add user. Remove old user's config/ if it exists.
 useradd -m -s /bin/bash plom
+rm /home/plom/.bashrc
 rm -rf /home/plom/config
 su - plom -c 'git clone http://github.com/plomlompom/config /home/plom/config'
-su plom -c '/home/plom/config/symlink.sh server'
+su plom -c '/home/plom/config/bin/symlink.sh server'
 
 # Set up editor.
 apt-get -y install vim
@@ -92,7 +93,7 @@ apt-get -y install openssh-server
 su plom -c 'mkdir -p /home/plom/mail/'
 su plom -c 'mkdir -p /home/plom/mail/inbox/{cur,new,tmp}'
 su plom -c 'mkdir -p /home/plom/mail/new_inbox/{cur,new,tmp}'
-sed -i 's/^delete = true$/delete = false/g' /home/plom/config/dotfiles_user_server/getmail/getmailrc
+sed -i 's/^delete = true$/delete = false/g' /home/plom/config/dotfiles/user/server/getmail/getmailrc
 DEBIAN_FRONTEND=noninteractive apt-get -y install getmail4 procmail mutt postfix maildrop
 cp config/systemfiles/main.cf /etc/postfix/main.cf
 cp config/systemfiles/aliases /etc/aliases
@@ -103,25 +104,16 @@ service postfix restart
 apt-get -y install cron
 su plom -c "echo '0 18 * * 0 ~/config/bin/simplemail.sh ~/config/mails/update_reminder' | crontab -"
 
-# Set up tmux.
-apt-get -y install tmux
-
-# Set up weechat, OTR, bitlbee.
-apt-get install weechat-plugins python-potr bitlbee
-cp config/systemfiles/weechat /etc/systemd/system/weechat.service
+# Set up screen/weechat/OTR/bitlbee. Make bitlbee listen only locally.
+apt-get -y install screen weechat-plugins python-potr bitlbee
+sed -i 's/^# DaemonInterface/DaemonInterface = 127.0.0.1 # DaemonInterface/' /etc/bitlbee/bitlbee.conf
+sedtest=`grep -E '^DaemonInterface = 127.0.0.1 #' /etc/bitlbee/bitlbee.conf | wc -l | cut -d ' ' -f 1`
+if [ 0 -eq $sedtest ]; then
+    false
+fi
+cp config/systemfiles/weechat.service  /etc/systemd/system/weechat.service
 systemctl enable /etc/systemd/system/weechat.service
 
-# Set up screen.
-#apt-get -y install screen
-#
-# Set up ping.
-#apt-get -y install iputils-ping
-#
-# Set up irssi.
-#apt-get -y install irssi
-#cp config/systemfiles/irssi.service /etc/systemd/system/irssi.service
-#systemctl enable /etc/systemd/system/irssi.service
-
 # Clean up.
 rm jessie_start_server.sh