浏览代码

More prosody settings

Bob Mottram 10 年前
父节点
当前提交
1fd272f108
共有 1 个文件被更改,包括 9 次插入2 次删除
  1. 9
    2
      install-freedombone.sh

+ 9
- 2
install-freedombone.sh 查看文件

1723
       echo 'modules_enabled = {' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1723
       echo 'modules_enabled = {' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1724
       echo '  "bosh"; -- Enable mod_bosh' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1724
       echo '  "bosh"; -- Enable mod_bosh' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1725
       echo '  "tls"; -- Enable mod_tls' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1725
       echo '  "tls"; -- Enable mod_tls' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1726
+      echo '  "saslauth"; -- Enable mod_saslauth' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1726
       echo '}' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1727
       echo '}' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1727
       echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1728
       echo '' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1728
       echo 'c2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1729
       echo 'c2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1729
       echo 's2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1730
       echo 's2s_require_encryption = true' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1731
+      echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1730
   fi
1732
   fi
1731
   ln -sf /etc/prosody/conf.avail/xmpp.cfg.lua /etc/prosody/conf.d/xmpp.cfg.lua
1733
   ln -sf /etc/prosody/conf.avail/xmpp.cfg.lua /etc/prosody/conf.d/xmpp.cfg.lua
1732
 
1734
 
1739
   if ! grep -q "s2s_require_encryption" /etc/prosody/prosody.cfg.lua; then
1741
   if ! grep -q "s2s_require_encryption" /etc/prosody/prosody.cfg.lua; then
1740
       sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua
1742
       sed -i '/c2s_require_encryption/a\s2s_require_encryption = true' /etc/prosody/prosody.cfg.lua
1741
   fi
1743
   fi
1744
+  if ! grep -q "allow_unencrypted_plain_auth" /etc/prosody/prosody.cfg.lua; then
1745
+      echo 'allow_unencrypted_plain_auth = false' >> /etc/prosody/conf.avail/xmpp.cfg.lua
1746
+  fi
1742
   sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua
1747
   sed -i 's/--"bosh";/"bosh";/g' /etc/prosody/prosody.cfg.lua
1743
   sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"/g' /etc/prosody/prosody.cfg.lua
1748
   sed -i 's/authentication = "internal_plain"/authentication = "internal_hashed"/g' /etc/prosody/prosody.cfg.lua
1749
+  sed -i 's/enabled = false -- Remove this line to enable this host//g' /etc/prosody/prosody.cfg.lua
1750
+  sed -i 's/example.com/$DOMAIN_NAME/g' /etc/prosody/prosody.cfg.lua
1744
 
1751
 
1745
   service prosody restart
1752
   service prosody restart
1746
   touch /home/$MY_USERNAME/README
1753
   touch /home/$MY_USERNAME/README
1747
 
1754
 
1748
-  if ! grep -Fxq "Your XMPP password is" /home/$MY_USERNAME/README; then
1755
+  if ! grep -q "Your XMPP password is" /home/$MY_USERNAME/README; then
1749
       XMPP_PASSWORD=$(openssl rand -base64 8)
1756
       XMPP_PASSWORD=$(openssl rand -base64 8)
1750
       prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD
1757
       prosodyctl register $MY_USERNAME $DOMAIN_NAME $XMPP_PASSWORD
1751
       echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
1758
       echo "Your XMPP password is: $XMPP_PASSWORD" >> /home/$MY_USERNAME/README
1752
       echo 'You can change it with: ' >> /home/$MY_USERNAME/README
1759
       echo 'You can change it with: ' >> /home/$MY_USERNAME/README
1753
       echo '' >> /home/$MY_USERNAME/README
1760
       echo '' >> /home/$MY_USERNAME/README
1754
-      echo "    prosodyctl new_password $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/README
1761
+      echo "    prosodyctl passwd $MY_USERNAME@$DOMAIN_NAME" >> /home/$MY_USERNAME/README
1755
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
1762
       chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
1756
   fi
1763
   fi
1757
   echo 'install_xmpp' >> $COMPLETION_FILE
1764
   echo 'install_xmpp' >> $COMPLETION_FILE