瀏覽代碼

Don't repeatedly config congestion control

Bob Mottram 8 年之前
父節點
當前提交
c713c613c9
共有 2 個檔案被更改,包括 54 行新增11 行删除
  1. 42
    7
      src/freedombone-utils-setup
  2. 12
    4
      src/freedombone-utils-web

+ 42
- 7
src/freedombone-utils-setup 查看文件

@@ -667,12 +667,45 @@ function setup_firewall {
667 667
 
668 668
 function setup_powerline {
669 669
     if [ -f ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ]; then
670
-        cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
671
-        cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
670
+        if [ ! -f ~/.powerline.bash ]; then
671
+            cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
672
+        else
673
+            HASH1=$(sha256sum ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}')
674
+            HASH2=$(sha256sum ~/.powerline.bash | awk -F ' ' '{print $1}')
675
+            if [[ "$HASH1" != "$HASH2" ]]; then
676
+                cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
677
+            fi
678
+        fi
679
+        if [ ! -f /etc/skel/.powerline.bash ]; then
680
+            cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
681
+        else
682
+            HASH1=$(sha256sum ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}')
683
+            HASH2=$(sha256sum /etc/skel/.powerline.bash | awk -F ' ' '{print $1}')
684
+            if [[ "$HASH1" != "$HASH2" ]]; then
685
+                cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
686
+            fi
687
+        fi
672 688
     else
673 689
         if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ]; then
674
-            cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
675
-            cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
690
+            if [ ! -f ~/.powerline.bash ]; then
691
+                cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
692
+            else
693
+                HASH1=$(sha256sum /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}')
694
+                HASH2=$(sha256sum ~/.powerline.bash | awk -F ' ' '{print $1}')
695
+                if [[ "$HASH1" != "$HASH2" ]]; then
696
+                    cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash
697
+                fi
698
+            fi
699
+
700
+            if [ ! -f /etc/skel/.powerline.bash ]; then
701
+                cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
702
+            else
703
+                HASH1=$(sha256sum /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}')
704
+                HASH2=$(sha256sum /etc/skel/.powerline.bash | awk -F ' ' '{print $1}')
705
+                if [[ "$HASH1" != "$HASH2" ]]; then
706
+                    cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash
707
+                fi
708
+            fi
676 709
         fi
677 710
     fi
678 711
     if ! grep -q "powerline" ~/.bashrc; then
@@ -689,9 +722,11 @@ function setup_powerline {
689 722
 
690 723
 function congestion_control {
691 724
     # see /proc/sys/net/ipv4/tcp_congestion_control
692
-    echo 'net.core.default_qdisc=fq' > /etc/sysctl.d/10-custom-kernel-bbr.conf
693
-    echo 'net.ipv4.tcp_congestion_control=bbr' >> /etc/sysctl.d/10-custom-kernel-bbr.conf
694
-    sysctl --system
725
+    if [ ! -f /etc/sysctl.d/10-custom-kernel-bbr.conf ]; then
726
+        echo 'net.core.default_qdisc=fq' > /etc/sysctl.d/10-custom-kernel-bbr.conf
727
+        echo 'net.ipv4.tcp_congestion_control=bbr' >> /etc/sysctl.d/10-custom-kernel-bbr.conf
728
+        sysctl --system
729
+    fi
695 730
 }
696 731
 
697 732
 function setup_utils {

+ 12
- 4
src/freedombone-utils-web 查看文件

@@ -789,11 +789,19 @@ function update_default_domain {
789 789
             cp /etc/ssl/certs/xmpp* /etc/prosody/certs
790 790
             if [ /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
791 791
                 usermod -a -G ssl-cert prosody
792
-                sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
793
-                sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
792
+                if grep -q "/etc/prosody/certs/xmpp.key" /etc/prosody/conf.avail/xmpp.cfg.lua; then
793
+                    sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua
794
+                fi
795
+                if grep -q "/etc/prosody/certs/xmpp.crt" /etc/prosody/conf.avail/xmpp.cfg.lua; then
796
+                    sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua
797
+                fi
794 798
 
795
-                sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/prosody.cfg.lua
796
-                sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/prosody.cfg.lua
799
+                if grep -q "/etc/prosody/certs/xmpp.key" /etc/prosody/prosody.cfg.lua; then
800
+                    sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/prosody.cfg.lua
801
+                fi
802
+                if grep -q "/etc/prosody/certs/xmpp.crt" /etc/prosody/prosody.cfg.lua; then
803
+                    sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/prosody.cfg.lua
804
+                fi
797 805
             fi
798 806
 
799 807
             if grep -q "/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key" /etc/prosody/conf.avail/xmpp.cfg.lua; then