diff --git a/src/freedombone b/src/freedombone
index a5ad2dce..df28e7dc 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1224,25 +1224,83 @@ function set_default_onion_domains {
fi
if [ $OWNCLOUD_DOMAIN_NAME ]; then
- OWNCLOUD_DOMAIN_NAME='owncloud.onion'
+ OWNCLOUD_DOMAIN_NAME='owncloud.local'
fi
if [ $MICROBLOG_DOMAIN_NAME ]; then
- MICROBLOG_DOMAIN_NAME='microblog.onion'
+ MICROBLOG_DOMAIN_NAME='microblog.local'
fi
if [ $FULLBLOG_DOMAIN_NAME ]; then
- FULLBLOG_DOMAIN_NAME='blog.onion'
+ FULLBLOG_DOMAIN_NAME='blog.local'
fi
if [ $GIT_DOMAIN_NAME ]; then
- GIT_DOMAIN_NAME='git.onion'
+ GIT_DOMAIN_NAME='git.local'
fi
if [ $WIKI_DOMAIN_NAME ]; then
- WIKI_DOMAIN_NAME='wiki.onion'
+ WIKI_DOMAIN_NAME='wiki.local'
fi
if [ $DEFAULT_DOMAIN_NAME ]; then
DEFAULT_DOMAIN_NAME="${PROJECT_NAME}.local"
fi
}
+function create_avahi_onion_domains {
+ if [ $OWNCLOUD_DOMAIN_NAME ]; then
+ echo '' > /etc/avahi/services/owncloud.service
+ echo '' >> /etc/avahi/services/owncloud.service
+ echo '' >> /etc/avahi/services/owncloud.service
+ echo ' %h HTTP' >> /etc/avahi/services/owncloud.service
+ echo ' ' >> /etc/avahi/services/owncloud.service
+ echo ' _http._tcp' >> /etc/avahi/services/owncloud.service
+ echo " $OWNCLOUD_ONION_PORT" >> /etc/avahi/services/owncloud.service
+ echo ' ' >> /etc/avahi/services/owncloud.service
+ echo '' >> /etc/avahi/services/owncloud.service
+ fi
+ if [ $MICROBLOG_DOMAIN_NAME ]; then
+ echo '' > /etc/avahi/services/microblog.service
+ echo '' >> /etc/avahi/services/microblog.service
+ echo '' >> /etc/avahi/services/microblog.service
+ echo ' %h HTTP' >> /etc/avahi/services/microblog.service
+ echo ' ' >> /etc/avahi/services/microblog.service
+ echo ' _http._tcp' >> /etc/avahi/services/microblog.service
+ echo " $MICROBLOG_ONION_PORT" >> /etc/avahi/services/microblog.service
+ echo ' ' >> /etc/avahi/services/microblog.service
+ echo '' >> /etc/avahi/services/microblog.service
+ fi
+ if [ $FULLBLOG_DOMAIN_NAME ]; then
+ echo '' > /etc/avahi/services/blog.service
+ echo '' >> /etc/avahi/services/blog.service
+ echo '' >> /etc/avahi/services/blog.service
+ echo ' %h HTTP' >> /etc/avahi/services/blog.service
+ echo ' ' >> /etc/avahi/services/blog.service
+ echo ' _http._tcp' >> /etc/avahi/services/blog.service
+ echo " $BLOG_ONION_PORT" >> /etc/avahi/services/blog.service
+ echo ' ' >> /etc/avahi/services/blog.service
+ echo '' >> /etc/avahi/services/blog.service
+ fi
+ if [ $GIT_DOMAIN_NAME ]; then
+ echo '' > /etc/avahi/services/git.service
+ echo '' >> /etc/avahi/services/git.service
+ echo '' >> /etc/avahi/services/git.service
+ echo ' %h HTTP' >> /etc/avahi/services/git.service
+ echo ' ' >> /etc/avahi/services/git.service
+ echo ' _http._tcp' >> /etc/avahi/services/git.service
+ echo " $GIT_ONION_PORT" >> /etc/avahi/services/git.service
+ echo ' ' >> /etc/avahi/services/git.service
+ echo '' >> /etc/avahi/services/git.service
+ fi
+ if [ $WIKI_DOMAIN_NAME ]; then
+ echo '' > /etc/avahi/services/wiki.service
+ echo '' >> /etc/avahi/services/wiki.service
+ echo '' >> /etc/avahi/services/wiki.service
+ echo ' %h HTTP' >> /etc/avahi/services/wiki.service
+ echo ' ' >> /etc/avahi/services/wiki.service
+ echo ' _http._tcp' >> /etc/avahi/services/wiki.service
+ echo " $WIKI_ONION_PORT" >> /etc/avahi/services/wiki.service
+ echo ' ' >> /etc/avahi/services/wiki.service
+ echo '' >> /etc/avahi/services/wiki.service
+ fi
+}
+
# check an individual domain name
function test_domain_name {
if [ $1 ]; then
@@ -3272,6 +3330,7 @@ function initial_setup {
apt-get -y dist-upgrade
apt-get -y install ca-certificates emacs24 cpulimit
apt-get -y install cryptsetup libgfshare-bin obnam sshpass wget
+ apt-get -y install avahi-daemon avahi-utils avahi-discover
echo 'initial_setup' >> $COMPLETION_FILE
}
@@ -9428,6 +9487,7 @@ letsencrypt_renewals
install_zeronet
install_watchdog_script
configure_avahi
+create_avahi_onion_domains
install_zeronet_blog
install_zeronet_mail
install_zeronet_forum