X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=all_new_2018%2Fuser_scripts%2Fplomlombot_daemon.sh;h=4831b3ce0cc9b83880eef5998c880a444f5159c1;hb=ed70f670e0aa29022aa9fbab587e7638ad3a3ce2;hp=b7d07093f138ee82e8802ce432776ba011f50b7c;hpb=ddcc8658999ccef1883086d6401071ca2d78634a;p=config

diff --git a/all_new_2018/user_scripts/plomlombot_daemon.sh b/all_new_2018/user_scripts/plomlombot_daemon.sh
index b7d0709..4831b3c 100755
--- a/all_new_2018/user_scripts/plomlombot_daemon.sh
+++ b/all_new_2018/user_scripts/plomlombot_daemon.sh
@@ -5,45 +5,49 @@ set -e
 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)
+            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)
-    	        server_name=$(echo -n "${line}" | cut -d' ' -f5)
-    	        set +e
-    	        screen -S "${session_name}" -Q select . > /dev/null
-    	        start_screen=$?
-    	        set -e
-    	        if [ "${start_screen}" -eq "1" ]; then
-    	    	cd ~/plomlombot-irc
-    	    	screen -d -m -S "${session_name}" ./run.sh -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 …
+            # 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
-    	        ln -sf "${logs_dir}" "${irclogs_dir}/${shortened_channel_name}"
+                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
+                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 "key:" line, encrypt old raw logs to that GPG key.
-    	    elif [ "${first_word}" = "gpg_key": ]; then
-    	        key=$(echo -n "${line}" | cut -d' ' -f2)
+            # If "key:" 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
+                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