瀏覽代碼

mesh install

Bob Mottram 9 年之前
父節點
當前提交
ebf5844b4b
共有 2 個檔案被更改,包括 7 行新增2 行删除
  1. 5
    1
      src/freedombone
  2. 2
    1
      src/freedombone-image-customise

+ 5
- 1
src/freedombone 查看文件

1235
             TLS_TIME_SOURCE2=$(grep "TLS_TIME_SOURCE2" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1235
             TLS_TIME_SOURCE2=$(grep "TLS_TIME_SOURCE2" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
1236
         fi
1236
         fi
1237
     fi
1237
     fi
1238
+	echo "System type: $SYSTEM_TYPE"
1238
 }
1239
 }
1239
 
1240
 
1240
 function set_default_onion_domains {
1241
 function set_default_onion_domains {
3447
     if grep -Fxq "change_debian_repos" $COMPLETION_FILE; then
3448
     if grep -Fxq "change_debian_repos" $COMPLETION_FILE; then
3448
         return
3449
         return
3449
     fi
3450
     fi
3451
+    if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
3452
+        return
3453
+    fi
3450
     rm -rf /var/lib/apt/lists/*
3454
     rm -rf /var/lib/apt/lists/*
3451
     apt-get clean
3455
     apt-get clean
3452
     sed -i "s/ftp.us.debian.org/$DEBIAN_REPO/g" /etc/apt/sources.list
3456
     sed -i "s/ftp.us.debian.org/$DEBIAN_REPO/g" /etc/apt/sources.list
8407
     #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8411
     #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8408
     #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8412
     #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8409
     #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8413
     #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
8410
-    
8414
+
8411
     MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
8415
     MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
8412
 
8416
 
8413
     systemctl restart php5-fpm
8417
     systemctl restart php5-fpm

+ 2
- 1
src/freedombone-image-customise 查看文件

341
     if [ $CONFIG_FILENAME ]; then
341
     if [ $CONFIG_FILENAME ]; then
342
         if [ ${#CONFIG_FILENAME} -gt 2 ]; then
342
         if [ ${#CONFIG_FILENAME} -gt 2 ]; then
343
             cp $CONFIG_FILENAME $rootdir/root/$PROJECT_NAME.cfg
343
             cp $CONFIG_FILENAME $rootdir/root/$PROJECT_NAME.cfg
344
-            chroot $rootdir $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
344
+            cat $rootdir/root/$PROJECT_NAME.cfg
345
+            chroot "$rootdir" $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
345
         fi
346
         fi
346
     fi
347
     fi
347
 }
348
 }