Procházet zdrojové kódy

Install irc and tox on the mesh variant

Bob Mottram před 10 roky
rodič
revize
e1c73c7732
1 změnil soubory, kde provedl 10 přidání a 5 odebrání
  1. 10
    5
      src/freedombone

+ 10
- 5
src/freedombone Zobrazit soubor

@@ -7831,7 +7831,7 @@ quit" > $INSTALL_DIR/batch.sql
7831 7831
 }
7832 7832
 
7833 7833
 function install_tox_node {
7834
-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7834
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
7835 7835
       return
7836 7836
   fi
7837 7837
   if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
@@ -8098,7 +8098,7 @@ function install_watchdog_script {
8098 8098
 }
8099 8099
 
8100 8100
 function install_irc_server {
8101
-  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
8101
+  if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
8102 8102
       return
8103 8103
   fi
8104 8104
   if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
@@ -8116,6 +8116,11 @@ function install_irc_server {
8116 8116
       check_certificates ngircd
8117 8117
   fi
8118 8118
 
8119
+  DEFAULTDOMAIN=$DEFAULT_DOMAIN_NAME
8120
+  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
8121
+      DEFAULTDOMAIN="${DEFAULT_DOMAIN_NAME}.local"
8122
+  fi
8123
+  
8119 8124
   echo '**************************************************' > /etc/ngircd/motd
8120 8125
   echo '*           F R E E D O M B O N E   I R C        *' >> /etc/ngircd/motd
8121 8126
   echo '*                                                *' >> /etc/ngircd/motd
@@ -8123,8 +8128,8 @@ function install_irc_server {
8123 8128
   echo '**************************************************' >> /etc/ngircd/motd
8124 8129
   sed -i 's|MotdFile = /etc/ngircd/ngircd.motd|MotdFile = /etc/ngircd/motd|g' /etc/ngircd/ngircd.conf
8125 8130
   sed -i "s/irc@irc.example.com/$MY_EMAIL_ADDRESS/g" /etc/ngircd/ngircd.conf
8126
-  sed -i "s/irc.example.net/$DEFAULT_DOMAIN_NAME/g" /etc/ngircd/ngircd.conf
8127
-  sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULT_DOMAIN_NAME|g" /etc/ngircd/ngircd.conf
8131
+  sed -i "s/irc.example.net/$DEFAULTDOMAIN/g" /etc/ngircd/ngircd.conf
8132
+  sed -i "s|Yet another IRC Server running on Debian GNU/Linux|IRC Server of $DEFAULTDOMAIN|g" /etc/ngircd/ngircd.conf
8128 8133
   sed -i 's/;Password = wealllikedebian/Password =/g' /etc/ngircd/ngircd.conf
8129 8134
   sed -i 's|;CertFile = /etc/ssl/certs/server.crt|CertFile = /etc/ssl/certs/ngircd.crt|g' /etc/ngircd/ngircd.conf
8130 8135
   sed -i 's|;DHFile = /etc/ngircd/dhparams.pem|DHFile = /etc/ssl/certs/ngircd.dhparam|g' /etc/ngircd/ngircd.conf
@@ -8162,7 +8167,7 @@ function install_irc_server {
8162 8167
       echo '==========' >> /home/$MY_USERNAME/README
8163 8168
       echo 'To connect to your IRC server in irssi:' >> /home/$MY_USERNAME/README
8164 8169
       echo '' >> /home/$MY_USERNAME/README
8165
-      echo "  /server add -auto -ssl $DEFAULT_DOMAIN_NAME 6697" >> /home/$MY_USERNAME/README
8170
+      echo "  /server add -auto -ssl $DEFAULTDOMAIN 6697" >> /home/$MY_USERNAME/README
8166 8171
       echo "  /connect $DEFAULT_DOMAIN_NAME" >> /home/$MY_USERNAME/README
8167 8172
       echo '  /join #freedombone' >> /home/$MY_USERNAME/README
8168 8173
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README