Bläddra i källkod

taller dialog

Bob Mottram 7 år sedan
förälder
incheckning
d268dd28d3
2 ändrade filer med 11 tillägg och 3 borttagningar
  1. 10
    2
      src/freedombone-app-xmpp
  2. 1
    1
      src/freedombone-config

+ 10
- 2
src/freedombone-app-xmpp Visa fil

884
     fi
884
     fi
885
 
885
 
886
     # create a certificate
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
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
889
             ${PROJECT_NAME}-addcert -h xmpp --dhkey ${DH_KEYLENGTH}
890
             check_certificates xmpp
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
         fi
899
         fi
892
     fi
900
     fi
893
 
901
 

+ 1
- 1
src/freedombone-config Visa fil

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