Bob Mottram 10 gadus atpakaļ
vecāks
revīzija
f9af361245
1 mainītis faili ar 15 papildinājumiem un 9 dzēšanām
  1. 15
    9
      install-freedombone.sh

+ 15
- 9
install-freedombone.sh Parādīt failu

1703
       return
1703
       return
1704
   fi
1704
   fi
1705
   apt-get -y --force-yes install prosody
1705
   apt-get -y --force-yes install prosody
1706
-  makecert xmpp
1706
+  if [ ! -f "/etc/ssl/private/xmpp.key" ]; then
1707
+      makecert xmpp
1708
+  fi
1707
   chown prosody:prosody /etc/ssl/private/xmpp.key
1709
   chown prosody:prosody /etc/ssl/private/xmpp.key
1708
   chown prosody:prosody /etc/ssl/certs/xmpp.*
1710
   chown prosody:prosody /etc/ssl/certs/xmpp.*
1709
   cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
1711
   cp -a /etc/prosody/conf.avail/example.com.cfg.lua /etc/prosody/conf.avail/xmpp.cfg.lua
1738
       sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua
1740
       sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua
1739
   fi
1741
   fi
1740
   sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua
1742
   sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua
1741
-  sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"' /etc/prosody/prosody.cfg.lua
1743
+  sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"/g' /etc/prosody/prosody.cfg.lua
1742
 
1744
 
1743
   service prosody restart
1745
   service prosody restart
1744
-  XMPP_PASSWORD=$(openssl rand -base64 8)
1745
-  prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD
1746
-  echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
1747
-  echo 'You can change it with: ' >> /home/$MY_USERNAME/README
1748
-  echo '' >> /home/$MY_USERNAME/README
1749
-  echo "    prosodyctl new_password $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/README
1750
-  chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
1746
+  touch /home/$MY_USERNAME/README
1747
+
1748
+  if ! grep -Fxq "Your XMPP password is" /home/$MY_USERNAME/README; then
1749
+      XMPP_PASSWORD=$(openssl rand -base64 8)
1750
+      prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD
1751
+      echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
1752
+      echo 'You can change it with: ' >> /home/$MY_USERNAME/README
1753
+      echo '' >> /home/$MY_USERNAME/README
1754
+      echo "    prosodyctl new_password $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/README
1755
+      chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
1756
+  fi
1751
   echo 'install_xmpp' >> $COMPLETION_FILE
1757
   echo 'install_xmpp' >> $COMPLETION_FILE
1752
 }
1758
 }
1753
 
1759