zeronet service description
This commit is contained in:
Bob Mottram
parent
f1734b0420
commit
e32fe64fe0
|
|
@ -38,7 +38,7 @@ ZERONET_MAIL_REPO="https://github.com/HelloZeroNet/ZeroMail"
|
|||
ZERONET_MAIL_COMMIT='955af09d643c72b02e4983d71eca5c0c93a6c131'
|
||||
ZERONET_FORUM_REPO="https://github.com/HelloZeroNet/ZeroTalk"
|
||||
ZERONET_FORUM_COMMIT='e2d2c9cb1cfbfef91b244935efb5c14c2ad95faa'
|
||||
ZERONET_URL=http://127.0.0.1:43110
|
||||
ZERONET_URL='http://127.0.0.1:43110'
|
||||
ZERONET_PORT=15441
|
||||
TRACKER_PORT=6969
|
||||
ZERONET_DEFAULT_BLOG_TAGLINE="Blogging on the Mesh"
|
||||
|
|
@ -229,14 +229,14 @@ function install_zeronet_blog {
|
|||
|
||||
# Add an avahi service
|
||||
function_check create_avahi_service
|
||||
create_avahi_service zeronet-blog "zeronet-blog" udp $ZERONET_PORT "$ZERONET_URL/$ZERONET_BLOG_ADDRESS"
|
||||
create_avahi_service zeronet-blog "zeronet-blog" udp $ZERONET_PORT "${ZERONET_URL}/${ZERONET_BLOG_ADDRESS}"
|
||||
cp /tmp/zeronet-blog.service /etc/avahi/services/zeronet-blog.service
|
||||
|
||||
if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
|
||||
mkdir -p /home/$MY_USERNAME/.config/zeronet
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
|
||||
fi
|
||||
echo "$ZERONET_URL/$ZERONET_BLOG_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myblog
|
||||
echo "${ZERONET_URL}/${ZERONET_BLOG_ADDRESS}" > /home/$MY_USERNAME/.config/zeronet/myblog
|
||||
|
||||
if ! grep -q "ZeroNet Blog address" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
|
|
@ -328,14 +328,14 @@ function install_zeronet_mail {
|
|||
|
||||
# Add an avahi service
|
||||
function_check create_avahi_service
|
||||
create_avahi_service zeronet-mail "zeronet-mail" udp $ZERONET_PORT "$ZERONET_URL/$ZERONET_MAIL_ADDRESS"
|
||||
create_avahi_service zeronet-mail "zeronet-mail" udp $ZERONET_PORT "${ZERONET_URL}/${ZERONET_MAIL_ADDRESS}"
|
||||
cp /tmp/zeronet-mail.service /etc/avahi/services/zeronet-mail.service
|
||||
|
||||
if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
|
||||
mkdir -p /home/$MY_USERNAME/.config/zeronet
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
|
||||
fi
|
||||
echo "$ZERONET_URL/$ZERONET_MAIL_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/mymail
|
||||
echo "${ZERONET_URL}/${ZERONET_MAIL_ADDRESS}" > /home/$MY_USERNAME/.config/zeronet/mymail
|
||||
|
||||
if ! grep -q $"ZeroNet Mail address" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
|
|
@ -421,14 +421,14 @@ function install_zeronet_forum {
|
|||
|
||||
# Add an avahi service
|
||||
function_check create_avahi_service
|
||||
create_avahi_service zeronet-forum "zeronet-forum" udp $ZERONET_PORT "$ZERONET_URL/$ZERONET_FORUM_ADDRESS"
|
||||
create_avahi_service zeronet-forum "zeronet-forum" udp $ZERONET_PORT "${ZERONET_URL}/${ZERONET_FORUM_ADDRESS}"
|
||||
sudo cp /tmp/zeronet-forum.service /etc/avahi/services/zeronet-forum.service
|
||||
|
||||
if [ ! -d /home/$MY_USERNAME/.config/zeronet ]; then
|
||||
mkdir -p /home/$MY_USERNAME/.config/zeronet
|
||||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
|
||||
fi
|
||||
echo "$ZERONET_URL/$ZERONET_FORUM_ADDRESS" > /home/$MY_USERNAME/.config/zeronet/myforum
|
||||
echo "${ZERONET_URL}/${ZERONET_FORUM_ADDRESS}" > /home/$MY_USERNAME/.config/zeronet/myforum
|
||||
|
||||
if ! grep -q $"ZeroNet Forum address" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ function create_avahi_service {
|
|||
echo " <type>_${service_type}._${service_protocol}</type>" >> /etc/avahi/services/${service_name}.service
|
||||
echo " <port>${service_port}</port>" >> /etc/avahi/services/${service_name}.service
|
||||
if [ "$service_description" ]; then
|
||||
echo " <txt-record>$description</txt-record>" >> /tmp/zeronet-blog.service
|
||||
echo " <txt-record>$service_description</txt-record>" >> /tmp/zeronet-blog.service
|
||||
fi
|
||||
echo ' </service>' >> /etc/avahi/services/${service_name}.service
|
||||
echo '</service-group>' >> /etc/avahi/services/${service_name}.service
|
||||
|
|
|
|||
181
src/zeronetavahi
181
src/zeronetavahi
|
|
@ -71,6 +71,68 @@ ZERONET_MAIL_STR=$"ZeroNet Mail"
|
|||
ZERONET_FORUM_STR=$"ZeroNet Forum"
|
||||
NO_USERS_STR=$"No users found"
|
||||
|
||||
# contains the output of the avahi command
|
||||
TEMPFILE_BASE=/tmp/tmpzeronetavahibase.txt
|
||||
TEMPFILE=/tmp/tmpzeronetavahi.txt
|
||||
|
||||
function ipfs_bootstrap {
|
||||
cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
|
||||
|
||||
state=0
|
||||
address=""
|
||||
peer=""
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
if [ ${state} -eq "3" ]; then
|
||||
if [[ $line == *"txt ="* ]]; then
|
||||
ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}')
|
||||
ipfs bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
|
||||
state=0
|
||||
fi
|
||||
fi
|
||||
if [ ${state} -eq "2" ]; then
|
||||
if [[ $line == *"address ="* ]]; then
|
||||
address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
||||
state=3
|
||||
fi
|
||||
fi
|
||||
if [ ${state} -eq "1" ]; then
|
||||
if [[ $line == *"hostname ="* ]]; then
|
||||
peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
||||
state=2
|
||||
fi
|
||||
fi
|
||||
if [[ $line == *"IPFS"* && $line == "= "* ]]; then
|
||||
state=1
|
||||
fi
|
||||
done < "$TEMPFILE"
|
||||
}
|
||||
|
||||
function detect_tox_users {
|
||||
lstox > $TEMPFILE
|
||||
toxctr=0
|
||||
echo '<ol type="square">' >> $TOX_USERS_FILE.new
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
if [[ $line != "Failed*" ]]; then
|
||||
echo " <li>$line</li>" >> $TOX_USERS_FILE.new
|
||||
toxctr=$((toxctr + 1))
|
||||
fi
|
||||
done < "$TEMPFILE"
|
||||
if [ $toxctr -eq "0" ]; then
|
||||
echo " <li>${NO_USERS_STR}</li>" >> $TOX_USERS_FILE.new
|
||||
fi
|
||||
echo '<ol>' >> $TOX_USERS_FILE.new
|
||||
}
|
||||
|
||||
function assemble_web_page {
|
||||
f="$1"
|
||||
fhome="$2"
|
||||
cat "${f}-header.html" "${f}.new" "${f}-footer.html" > "${f}.html"
|
||||
rm -f "${f}.new"
|
||||
if [ -d "${fhome}" ]; then
|
||||
sudo chown zeronet:zeronet "$f"
|
||||
fi
|
||||
}
|
||||
|
||||
function create_index {
|
||||
if [ -f $ZERONET_INDEX ]; then
|
||||
sed -i "s|.*${MY_BLOG_STR}.*| <li><a href=\"$(cat /home/$MY_USERNAME/.config/zeronet/myblog)\">${MY_BLOG_STR}</a></li>|g" $ZERONET_INDEX
|
||||
|
|
@ -132,19 +194,16 @@ function create_footer {
|
|||
echo '</html>' >> $footer_file
|
||||
}
|
||||
|
||||
if [ ! -d /etc/avahi ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
function avahi_extract_info {
|
||||
# Create a list of bootstrap nodes
|
||||
TEMPFILE_BASE=/tmp/tmpzeronetavahibase.txt
|
||||
TEMPFILE=/tmp/tmpzeronetavahi.txt
|
||||
avahi-browse -atr > $TEMPFILE_BASE
|
||||
cat $TEMPFILE_BASE | grep "hostname =\|address =\|port =" > $TEMPFILE
|
||||
if [ ! -f $TEMPFILE ]; then
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
function zeronet_detect {
|
||||
if [ -f $ZERONET_CONFIG.new ]; then
|
||||
rm -f $ZERONET_CONFIG.new
|
||||
fi
|
||||
|
|
@ -172,8 +231,9 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
|
|||
state=1
|
||||
fi
|
||||
done < "$TEMPFILE"
|
||||
}
|
||||
|
||||
# detect blogs in the mesh
|
||||
function zeronet_detect_blog {
|
||||
if [ -f $BLOGS_FILE.new ]; then
|
||||
rm -f $BLOGS_FILE.new
|
||||
fi
|
||||
|
|
@ -209,9 +269,9 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
|
|||
fi
|
||||
done < "$TEMPFILE"
|
||||
echo '</ol>' >> $BLOGS_FILE.new
|
||||
}
|
||||
|
||||
|
||||
# detect mail in the mesh
|
||||
function zeronet_detect_mail {
|
||||
if [ -f $MAIL_FILE.new ]; then
|
||||
rm -f $MAIL_FILE.new
|
||||
fi
|
||||
|
|
@ -247,9 +307,9 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
|
|||
fi
|
||||
done < "$TEMPFILE"
|
||||
echo '</ol>' >> $MAIL_FILE.new
|
||||
}
|
||||
|
||||
|
||||
# detect fora in the mesh
|
||||
function zeronet_detect_fora {
|
||||
if [ -f $FORUM_FILE.new ]; then
|
||||
rm -f $FORUM_FILE.new
|
||||
fi
|
||||
|
|
@ -285,59 +345,14 @@ while IFS='' read -r line || [[ -n "$line" ]]; do
|
|||
fi
|
||||
done < "$TEMPFILE"
|
||||
echo '<ol>' >> $FORUM_FILE.new
|
||||
}
|
||||
|
||||
|
||||
# IPFS bootstrap
|
||||
cat $TEMPFILE_BASE | grep "IPFS\|hostname =\|address =\|port =\|txt =" > $TEMPFILE
|
||||
|
||||
state=0
|
||||
address=""
|
||||
peer=""
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
if [ ${state} -eq "3" ]; then
|
||||
if [[ $line == *"txt ="* ]]; then
|
||||
ipfs_peer_id=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}' | awk -F '"' '{print $2}')
|
||||
ipfs bootstrap add /ip4/${address}/tcp/${IPFS_PORT}/ipfs/${ipfs_peer_id}
|
||||
state=0
|
||||
fi
|
||||
fi
|
||||
if [ ${state} -eq "2" ]; then
|
||||
if [[ $line == *"address ="* ]]; then
|
||||
address=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
||||
state=3
|
||||
fi
|
||||
fi
|
||||
if [ ${state} -eq "1" ]; then
|
||||
if [[ $line == *"hostname ="* ]]; then
|
||||
peer=$(echo $line | awk -F '[' '{print $2}' | awk -F ']' '{print $1}')
|
||||
state=2
|
||||
fi
|
||||
fi
|
||||
if [[ $line == *"IPFS"* && $line == "= "* ]]; then
|
||||
state=1
|
||||
fi
|
||||
done < "$TEMPFILE"
|
||||
|
||||
|
||||
# detect Tox users
|
||||
lstox > $TEMPFILE
|
||||
toxctr=0
|
||||
echo '<ol type="square">' >> $TOX_USERS_FILE.new
|
||||
while IFS='' read -r line || [[ -n "$line" ]]; do
|
||||
if [[ $line != "Failed*" ]]; then
|
||||
echo " <li>$line</li>" >> $TOX_USERS_FILE.new
|
||||
toxctr=$((toxctr + 1))
|
||||
fi
|
||||
done < "$TEMPFILE"
|
||||
if [ $toxctr -eq "0" ]; then
|
||||
echo " <li>${NO_USERS_STR}</li>" >> $TOX_USERS_FILE.new
|
||||
fi
|
||||
echo '<ol>' >> $TOX_USERS_FILE.new
|
||||
|
||||
|
||||
function avahi_remove_info {
|
||||
rm -f $TEMPFILE_BASE
|
||||
rm -f $TEMPFILE
|
||||
}
|
||||
|
||||
function zeronet_update_config {
|
||||
if [ ${tracker_ctr} -gt "0" ]; then
|
||||
cp -f $ZERONET_CONFIG.new $ZERONET_CONFIG
|
||||
else
|
||||
|
|
@ -349,6 +364,21 @@ rm -f $ZERONET_CONFIG.new
|
|||
if [ -d $ZERONET_USER_HOME ]; then
|
||||
sudo chown zeronet:zeronet $ZERONET_CONFIG
|
||||
fi
|
||||
}
|
||||
|
||||
if [ ! -d /etc/avahi ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
avahi_extract_info
|
||||
zeronet_detect
|
||||
zeronet_detect_blog
|
||||
zeronet_detect_mail
|
||||
zeronet_detect_fora
|
||||
ipfs_bootstrap
|
||||
detect_tox_users
|
||||
avahi_remove_info
|
||||
zeronet_update_config
|
||||
|
||||
# make some html headers and footers
|
||||
create_header $BLOGS_FILE $BLOGS_STR
|
||||
|
|
@ -363,32 +393,9 @@ create_footer $TOX_USERS_FILE
|
|||
# make the index page
|
||||
create_index
|
||||
|
||||
# create a web page showing the available blogs
|
||||
cat ${BLOGS_FILE}-header.html ${BLOGS_FILE}.new ${BLOGS_FILE}-footer.html > ${BLOGS_FILE}.html
|
||||
rm -f ${BLOGS_FILE}.new
|
||||
if [ -d $ZERONET_USER_HOME ]; then
|
||||
sudo chown zeronet:zeronet $BLOGS_FILE
|
||||
fi
|
||||
|
||||
# create a web page showing the available mail contacts
|
||||
cat ${MAIL_FILE}-header.html ${MAIL_FILE}.new ${MAIL_FILE}-footer.html > ${MAIL_FILE}.html
|
||||
rm -f ${MAIL_FILE}.new
|
||||
if [ -d $ZERONET_USER_HOME ]; then
|
||||
sudo chown zeronet:zeronet $MAIL_FILE
|
||||
fi
|
||||
|
||||
# create a web page showing the available fora
|
||||
cat ${FORUM_FILE}-header.html ${FORUM_FILE}.new ${FORUM_FILE}-footer.html > ${FORUM_FILE}.html
|
||||
rm -f ${FORUM_FILE}.new
|
||||
if [ -d $ZERONET_USER_HOME ]; then
|
||||
sudo chown zeronet:zeronet $FORUM_FILE
|
||||
fi
|
||||
|
||||
# create a web page showing Tox users
|
||||
cat ${TOX_USERS_FILE}-header.html ${TOX_USERS_FILE}.new ${TOX_USERS_FILE}-footer.html > ${TOX_USERS_FILE}.html
|
||||
rm -f ${TOX_USERS_FILE}.new
|
||||
if [ -d $ZERONET_USER_HOME ]; then
|
||||
sudo chown zeronet:zeronet $TOX_USERS_FILE
|
||||
fi
|
||||
assemble_web_page ${BLOGS_FILE} $ZERONET_USER_HOME
|
||||
assemble_web_page ${MAIL_FILE} $ZERONET_USER_HOME
|
||||
assemble_web_page ${FORUM_FILE} $ZERONET_USER_HOME
|
||||
assemble_web_page ${TOX_USERS_FILE} $ZERONET_USER_HOME
|
||||
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue