Browse Source

rebuild exim on upgrades

Bob Mottram 7 years ago
parent
commit
854e1db224
2 changed files with 17 additions and 0 deletions
  1. 16
    0
      src/freedombone-base-email
  2. 1
    0
      src/freedombone-upgrade

+ 16
- 0
src/freedombone-base-email View File

74
 exim_version='4.89'
74
 exim_version='4.89'
75
 
75
 
76
 function rebuild_exim_with_socks {
76
 function rebuild_exim_with_socks {
77
+    exim_socks_installed=$(get_completion_param "exim_socks")
78
+    if [[ "$exim_socks_installed" == 'true' ]]; then
79
+        return
80
+    fi
81
+
77
     # shellcheck disable=SC2154
82
     # shellcheck disable=SC2154
78
     if [ ! -d "$INSTALL_DIR" ]; then
83
     if [ ! -d "$INSTALL_DIR" ]; then
79
         mkdir -p "$INSTALL_DIR/exim4"
84
         mkdir -p "$INSTALL_DIR/exim4"
156
     dpkg -i exim4_${exim_version}_all.deb
161
     dpkg -i exim4_${exim_version}_all.deb
157
     apt-mark -q hold exim4
162
     apt-mark -q hold exim4
158
     apt-get -yq remove --purge at
163
     apt-get -yq remove --purge at
164
+
165
+    systemctl restart exim4
166
+    if [[ $(systemctl is-active exim4) != 'active' ]]; then
167
+        apt-mark -q unhold exim4
168
+        apt-get -yq install exim4 --reinstall
169
+        systemctl restart exim4
170
+    fi
171
+
172
+    rm -rf "$INSTALL_DIR/exim4"
173
+
174
+    set_completion_param "exim_socks" "true"
159
 }
175
 }
160
 
176
 
161
 function email_create_template {
177
 function email_create_template {

+ 1
- 0
src/freedombone-upgrade View File

92
             exit 453536
92
             exit 453536
93
         fi
93
         fi
94
 
94
 
95
+        rebuild_exim_with_socks
95
         apt-get -yq -t stretch-backports install certbot
96
         apt-get -yq -t stretch-backports install certbot
96
         email_install_tls
97
         email_install_tls
97
         email_disable_chunking
98
         email_disable_chunking