mesh install

This commit is contained in:
Bob Mottram 2016-01-11 17:06:59 +00:00
parent d277cae798
commit ebf5844b4b
2 changed files with 7 additions and 2 deletions

View File

@ -1235,6 +1235,7 @@ function read_configuration {
TLS_TIME_SOURCE2=$(grep "TLS_TIME_SOURCE2" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
fi
fi
echo "System type: $SYSTEM_TYPE"
}
function set_default_onion_domains {
@ -3447,6 +3448,9 @@ function change_debian_repos {
if grep -Fxq "change_debian_repos" $COMPLETION_FILE; then
return
fi
if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
return
fi
rm -rf /var/lib/apt/lists/*
apt-get clean
sed -i "s/ftp.us.debian.org/$DEBIAN_REPO/g" /etc/apt/sources.list
@ -8407,7 +8411,7 @@ quit" > $INSTALL_DIR/batch.sql
#echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
#echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
#echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
systemctl restart php5-fpm

View File

@ -341,7 +341,8 @@ continue_installation() {
if [ $CONFIG_FILENAME ]; then
if [ ${#CONFIG_FILENAME} -gt 2 ]; then
cp $CONFIG_FILENAME $rootdir/root/$PROJECT_NAME.cfg
chroot $rootdir $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
cat $rootdir/root/$PROJECT_NAME.cfg
chroot "$rootdir" $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
fi
fi
}