Browse Source

Prevent nodejs package upgrades

Bob Mottram 7 years ago
parent
commit
eea614e263
2 changed files with 16 additions and 5 deletions
  1. 15
    5
      src/freedombone-base-email
  2. 1
    0
      src/freedombone-utils-nodejs

+ 15
- 5
src/freedombone-base-email View File

161
     #apt-get -yq install tinycdb perl
161
     #apt-get -yq install tinycdb perl
162
 
162
 
163
     # MX record should be:
163
     # MX record should be:
164
-    # _onion-mx._tcp.$DEFAULT_DOMAIN_NAME. 3600 IN SRV 0 5 25 $onion_address
164
+    # _onion-mx._tcp
165
+    # 20:$onion_address
166
+    # 3600 IN SRV 0 5 25 $onion_address
167
+
168
+    # Test with: exim -d -bt $onion_address
165
 
169
 
166
     #echo "$DEFAULT_DOMAIN_NAME $onion_address" > /etc/exim4/onionrelay.txt
170
     #echo "$DEFAULT_DOMAIN_NAME $onion_address" > /etc/exim4/onionrelay.txt
167
     #cdb -m -c -t ~/onionrelay.tmp /etc/exim4/onionrelay.cdb /etc/exim4/onionrelay.txt
171
     #cdb -m -c -t ~/onionrelay.tmp /etc/exim4/onionrelay.cdb /etc/exim4/onionrelay.txt
850
     sed -i 's|pam_mail.so standard noenv|pam_mail.so dir=~/Maildir standard|g' /etc/pam.d/sshd
854
     sed -i 's|pam_mail.so standard noenv|pam_mail.so dir=~/Maildir standard|g' /etc/pam.d/sshd
851
     sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su
855
     sed -i 's|pam_mail.so nopen|pam_mail.so dir=~/Maildir nopen|g' /etc/pam.d/su
852
 
856
 
853
-    { echo "dc_eximconfig_configtype='internet'";
854
-      echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME}'";
855
-      echo "dc_local_interfaces=''";
857
+    echo "dc_eximconfig_configtype='internet'" > /etc/exim4/update-exim4.conf.conf
858
+
859
+    if [[ $ONION_ONLY == 'no' ]]; then
860
+        echo "dc_other_hostnames='${DEFAULT_DOMAIN_NAME};mail.${DEFAULT_DOMAIN_NAME}'" >> /etc/exim4/update-exim4.conf.conf
861
+    else
862
+        echo "dc_other_hostnames='${onion_address}'" >> /etc/exim4/update-exim4.conf.conf
863
+    fi
864
+
865
+    { echo "dc_local_interfaces=''";
856
       echo "dc_readhost=''";
866
       echo "dc_readhost=''";
857
       echo "dc_relay_domains=''";
867
       echo "dc_relay_domains=''";
858
-      echo "dc_minimaldns='false'"; } > /etc/exim4/update-exim4.conf.conf
868
+      echo "dc_minimaldns='false'"; } >> /etc/exim4/update-exim4.conf.conf
859
     IPv4_address=$(get_ipv4_address)
869
     IPv4_address=$(get_ipv4_address)
860
     IPv4_address_base=$(echo "$IPv4_address" | awk -F '.' '{print $1"."$2"."$3}')
870
     IPv4_address_base=$(echo "$IPv4_address" | awk -F '.' '{print $1"."$2"."$3}')
861
     RELAY_NETS="${IPv4_address_base}.0/24"
871
     RELAY_NETS="${IPv4_address_base}.0/24"

+ 1
- 0
src/freedombone-utils-nodejs View File

95
     fi
95
     fi
96
 
96
 
97
     $mesh_install_nodejs_prefix apt-get -yq install nodejs
97
     $mesh_install_nodejs_prefix apt-get -yq install nodejs
98
+    $mesh_install_nodejs_prefix apt-mark -q hold nodejs
98
 
99
 
99
     if [ -f "$rootdir/usr/bin/nodejs" ]; then
100
     if [ -f "$rootdir/usr/bin/nodejs" ]; then
100
         cp "$rootdir/usr/bin/nodejs" "$rootdir/usr/bin/node"
101
         cp "$rootdir/usr/bin/nodejs" "$rootdir/usr/bin/node"