diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup index e0fbe7f1..33833bf2 100755 --- a/src/freedombone-utils-setup +++ b/src/freedombone-utils-setup @@ -667,12 +667,45 @@ function setup_firewall { function setup_powerline { if [ -f ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ]; then - cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash - cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + if [ ! -f ~/.powerline.bash ]; then + cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash + else + HASH1=$(sha256sum ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}') + HASH2=$(sha256sum ~/.powerline.bash | awk -F ' ' '{print $1}') + if [[ "$HASH1" != "$HASH2" ]]; then + cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash + fi + fi + if [ ! -f /etc/skel/.powerline.bash ]; then + cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + else + HASH1=$(sha256sum ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}') + HASH2=$(sha256sum /etc/skel/.powerline.bash | awk -F ' ' '{print $1}') + if [[ "$HASH1" != "$HASH2" ]]; then + cp ~/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + fi + fi else if [ -f /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ]; then - cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash - cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + if [ ! -f ~/.powerline.bash ]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash + else + HASH1=$(sha256sum /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}') + HASH2=$(sha256sum ~/.powerline.bash | awk -F ' ' '{print $1}') + if [[ "$HASH1" != "$HASH2" ]]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline ~/.powerline.bash + fi + fi + + if [ ! -f /etc/skel/.powerline.bash ]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + else + HASH1=$(sha256sum /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline | awk -F ' ' '{print $1}') + HASH2=$(sha256sum /etc/skel/.powerline.bash | awk -F ' ' '{print $1}') + if [[ "$HASH1" != "$HASH2" ]]; then + cp /home/${MY_USERNAME}/${PROJECT_NAME}/src/${PROJECT_NAME}-powerline /etc/skel/.powerline.bash + fi + fi fi fi if ! grep -q "powerline" ~/.bashrc; then @@ -689,9 +722,11 @@ function setup_powerline { function congestion_control { # see /proc/sys/net/ipv4/tcp_congestion_control - echo 'net.core.default_qdisc=fq' > /etc/sysctl.d/10-custom-kernel-bbr.conf - echo 'net.ipv4.tcp_congestion_control=bbr' >> /etc/sysctl.d/10-custom-kernel-bbr.conf - sysctl --system + if [ ! -f /etc/sysctl.d/10-custom-kernel-bbr.conf ]; then + echo 'net.core.default_qdisc=fq' > /etc/sysctl.d/10-custom-kernel-bbr.conf + echo 'net.ipv4.tcp_congestion_control=bbr' >> /etc/sysctl.d/10-custom-kernel-bbr.conf + sysctl --system + fi } function setup_utils { diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index 1aa1de9d..76399a90 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -789,11 +789,19 @@ function update_default_domain { cp /etc/ssl/certs/xmpp* /etc/prosody/certs if [ /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then usermod -a -G ssl-cert prosody - sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua - sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua + if grep -q "/etc/prosody/certs/xmpp.key" /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/conf.avail/xmpp.cfg.lua + fi + if grep -q "/etc/prosody/certs/xmpp.crt" /etc/prosody/conf.avail/xmpp.cfg.lua; then + sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/conf.avail/xmpp.cfg.lua + fi - sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/prosody.cfg.lua - sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/prosody.cfg.lua + if grep -q "/etc/prosody/certs/xmpp.key" /etc/prosody/prosody.cfg.lua; then + sed -i "s|/etc/prosody/certs/xmpp.key|/etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/prosody/prosody.cfg.lua + fi + if grep -q "/etc/prosody/certs/xmpp.crt" /etc/prosody/prosody.cfg.lua; then + sed -i "s|/etc/prosody/certs/xmpp.crt|/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/prosody/prosody.cfg.lua + fi fi if grep -q "/etc/prosody/certs/${DEFAULT_DOMAIN_NAME}.key" /etc/prosody/conf.avail/xmpp.cfg.lua; then