Bob Mottram před 6 roky
rodič
revize
1de4feca45
2 změnil soubory, kde provedl 9 přidání a 3 odebrání
  1. 0
    3
      src/freedombone-upgrade
  2. 9
    0
      src/freedombone-utils-web

+ 0
- 3
src/freedombone-upgrade Zobrazit soubor

@@ -90,15 +90,12 @@ if [ -d "$PROJECT_DIR" ]; then
90 90
             chmod -R +r /usr/share/${PROJECT_NAME}
91 91
         fi
92 92
 
93
-        echo "test0"
94 93
         if ! ${PROJECT_NAME} -c "$CONFIGURATION_FILE"; then
95 94
             exit 453536
96 95
         fi
97 96
 
98 97
         #rebuild_exim_with_socks
99
-        echo "test1"
100 98
         install_dynamicdns
101
-        echo "test2"
102 99
         torrc_migrate
103 100
         nodejs_upgrade
104 101
         apt-get -yq -t stretch-backports install certbot

+ 9
- 0
src/freedombone-utils-web Zobrazit soubor

@@ -475,18 +475,23 @@ function upgrade_inadyn_config {
475 475
 }
476 476
 
477 477
 function install_dynamicdns {
478
+    echo "************ 1"
478 479
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
479 480
         return
480 481
     fi
482
+
483
+    echo "************ 2"
481 484
     if [[ $ONION_ONLY != "no" ]]; then
482 485
         return
483 486
     fi
484 487
 
488
+    echo "************ 3"
485 489
     CURR_INADYN_COMMIT=$(get_completion_param "inadyn commit")
486 490
     if [[ "${CURR_INADYN_COMMIT}" == "${INADYN_COMMIT}" ]]; then
487 491
         return
488 492
     fi
489 493
 
494
+    echo "************ 4"
490 495
     if [ -f /usr/local/sbin/inadyn ]; then
491 496
         if [ -d "$INSTALL_DIR/inadyn" ]; then
492 497
             rm -rf "$INSTALL_DIR/inadyn"
@@ -506,6 +511,7 @@ function install_dynamicdns {
506 511
     apt-get -yq install build-essential curl libgnutls28-dev automake1.11
507 512
     apt-get -yq install gnutls-dev libconfuse-dev
508 513
 
514
+    echo "************ 5"
509 515
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
510 516
         if [ -d /repos/inadyn ]; then
511 517
             mkdir "$INSTALL_DIR/inadyn"
@@ -516,17 +522,20 @@ function install_dynamicdns {
516 522
             git_clone "$INADYN_REPO" "$INSTALL_DIR/inadyn"
517 523
         fi
518 524
     fi
525
+    echo "************ 6"
519 526
     if [ ! -d "$INSTALL_DIR/inadyn" ]; then
520 527
         echo 'inadyn repo not cloned'
521 528
         echo -n | openssl s_client -showcerts -connect github.com:443 -CApath /etc/ssl/certs
522 529
         exit 6785
523 530
     fi
531
+    echo "************ 7"
524 532
     cd "$INSTALL_DIR/inadyn" || exit 246824684
525 533
     git checkout "$INADYN_COMMIT" -b "$INADYN_COMMIT"
526 534
     set_completion_param "inadyn commit" "$INADYN_COMMIT"
527 535
 
528 536
     ./autogen.sh
529 537
 
538
+    echo "************ 8"
530 539
     if ! ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-openssl; then
531 540
         exit 74890
532 541
     fi