Browse Source

taller dialog

Bob Mottram 7 years ago
parent
commit
d268dd28d3
2 changed files with 11 additions and 3 deletions
  1. 10
    2
      src/freedombone-app-xmpp
  2. 1
    1
      src/freedombone-config

+ 10
- 2
src/freedombone-app-xmpp View File

@@ -884,10 +884,18 @@ function install_xmpp_main {
884 884
     fi
885 885
 
886 886
     # create a certificate
887
-    if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "0" ]]; then
888
-        if [[ "$(cert_exists xmpp)" == "0" ]]; then
887
+    if [ ! -f /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem ]; then
888
+        if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
889 889
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
890 890
             check_certificates xmpp
891
+            if [ ! -f /etc/ssl/certs/xmpp.crt ]; then
892
+                echo $'Failed to create xmpp certificate'
893
+                exit 72352
894
+            fi
895
+            if [ ! -f /etc/ssl/private/xmpp.key ]; then
896
+                echo $'Failed to create xmpp private certificate'
897
+                exit 36829
898
+            fi
891 899
         fi
892 900
     fi
893 901
 

+ 1
- 1
src/freedombone-config View File

@@ -253,7 +253,7 @@ function choose_dynamic_dns {
253 253
         data=$(tempfile 2>/dev/null)
254 254
         trap "rm -f $data" 0 1 2 5 15
255 255
         dialog --backtitle $"Freedombone Configuration" \
256
-               --radiolist $"Choose Dynamic DNS provider:" 16 40 15 \
256
+               --radiolist $"Choose Dynamic DNS provider:" 23 40 23 \
257 257
                1 dyndns off \
258 258
                2 freedns on \
259 259
                3 zoneedit off \