Remove redundant downloads temporarily. Return to oneshot install state

This commit is contained in:
A 2025-02-05 15:50:05 -08:00
parent 13d928ad92
commit 5db4972364
5 changed files with 29 additions and 174 deletions

View File

@ -24,8 +24,6 @@ services:
SYNAPSE_CONFIG_DIR: "/data"
SYNAPSE_DATA_DIR: "/data"
TZ: "UA"
depends_on:
- caddy
configs:
- source: synapse-homeserver-config
target: /data/homeserver.yaml
@ -48,12 +46,12 @@ services:
healthcheck:
test: ['CMD', 'pg_isready', '-U', 'postgres']
environment:
- 'POSTGRES_DB=synapse'
- 'POSTGRES_USER=synapse'
- 'POSTGRES_HOST_AUTH_METHOD=trust'
- 'POSTGRES_INITDB_ARGS=--encoding="UTF8" --lc-collate="C" --lc-ctype="C"'
volumes:
- synapse_db:/var/lib/postgresql/data
depends_on:
- caddy
networks:
- back
deploy:
@ -75,7 +73,6 @@ services:
ports:
- "127.0.0.1:8001:8001"
depends_on:
- caddy
- synapse
configs:
- source: element-json-config

View File

@ -41,8 +41,6 @@ services:
- type: volume
source: mastodon_public
target: /mastodon/public/system
volume:
subpath: system
networks:
- mast-int
- back
@ -79,8 +77,6 @@ services:
- type: volume
source: mastodon_public
target: /mastodon/public/system
volume:
subpath: system
networks:
- mast-int

0
conf/mau/.gitkeep Normal file
View File

0
conf/synapse/.gitkeep Normal file
View File

View File

@ -11,68 +11,7 @@ DCOMMS_DIR=$PWD
COMPOSE_FILES="-f ./conf/compose/docker-compose.yml "
# Docker saved file names
FILES=(
# "dcomms_conf_v2.tar" # If we can grab the install script we can likely grab the configs.
# "caddy_2.6.4.tar"
)
D_IMAGES=("caddy:2.6.4")
DCOMMS_INSTANCES=(
# "kyiv.dcomm.net.ua"
# "odessa.dcomm.net.ua"
# "kharkiv.dcomm.net.ua"
# "lviv.dcomm.net.ua"
# "lviv2.dcomm.net.ua"
# "rivne.dcomm.net.ua"
# "kherson.dcomm.net.ua"
# "mykolayiv.dcomm.net.ua"
)
IPFS_GATEWAYS=(
"ipfs.io/ipfs"
"cf-ipfs.com/ipfs"
"gateway.ipfs.io/ipfs"
"cloudflare-ipfs.com/ipfs"
"ipfs.best-practice.se/ipfs"
"ipfs.2read.net/ipfs"
)
IPFS_DIR="QmbCFPd8ACTicxQsuDyUfm1C1jMwveocdVDn2K3nruaaVF"
#List of trackers for generating the magnet link, only use this once to save on space
MAG_TRACKERS="&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2F9.rarbg.com%3A2810%2Fannounce&tr=udp%3A%2F%2Fopen.tracker.cl%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A6969%2Fannounce&tr=http%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&tr=udp%3A%2F%2Fopentracker.i2p.rocks%3A6969%2Fannounce&tr=https%3A%2F%2Fopentracker.i2p.rocks%3A443%2Fannounce&tr=udp%3A%2F%2Fwww.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451%2Fannounce&tr=udp%3A%2F%2Fopen.stealth.si%3A80%2Fannounce&tr=udp%3A%2F%2Fexodus.desync.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.tiny-vps.com%3A6969%2Fannounce&tr=udp%3A%2F%2Ftracker.dler.org%3A6969%2Fannounce&tr=udp%3A%2F%2Ftr.cili001.com%3A8070%2Fannounce&tr=udp%3A%2F%2Fipv4.tracker.harry.lu%3A80%2Fannounce&tr=udp%3A%2F%2Fexplodie.org%3A6969%2Fannounce&tr=udp%3A%2F%2Fbt.oiyo.tk%3A6969%2Fannounce&tr=https%3A%2F%2Ftracker.nanoha.org%3A443%2Fannounce&tr=https%3A%2F%2Ftracker.logirl.moe%3A443%2Fannounce&tr=https%3A%2F%2Ftracker.lilithraws.org%3A443%2Fannounce"
#Big ugly blob of links. Yikes
MAGNET_LINKS=(
"magnet:?xt=urn:btih:806E6EA23B5098BB112B1C1EA6ACF1D4E374C1D8&dn=dcomms_conf_v2.tar"
#"magnet:?xt=urn:btih:F1A024E0878324F3749193A28DE6C4C33252E670&dn=caddy_2.6.2.tar"
"magnet:?xt=urn:btih:9F004AEF55ECE1DF2908F6FA33C7FC7CDD5EEE43&dn=ceno-client_latest.tar"
"magnet:?xt=urn:btih:A8865661D17C7C1669738DE3892A245CBFE0B384&dn=deltachat-mailadm-dovecot_v0.0.1.tar"
"magnet:?xt=urn:btih:15DC00304F12941B9DC03103ABE70FA27D4FDB1A&dn=deltachat-mailadm-postfix_v0.0.3.tar"
"magnet:?xt=urn:btih:0DB1E810B538AE6B73C12F20461D8D90ADAE4372&dn=deltachat-mailadm_v0.0.1.tar"
#"magnet:?xt=urn:btih:DD660DDCE77DBEBB3CBCDDE45600203DAD5FE488&dn=element-web_v1.11.17.tar"
#"magnet:?xt=urn:btih:63C98AC0E0F799AEC65D6C6B4005E3748068A339&dn=mastodon_v4.1.0.tar"
"magnet:?xt=urn:btih:5D74122C024622B2E02DE5D852A17D5C22C2C28F&dn=maubot_v0.3.1.tar"
"magnet:?xt=urn:btih:824829D5F526A82C7209160C3E709B4BA6624442&dn=postgres_14-alpine.tar"
"magnet:?xt=urn:btih:4EEDD83F3DD76489F3AB70F07035CDE5B87C0A65&dn=redis_7.0-alpine.tar"
#"magnet:?xt=urn:btih:24116174AF54EC4DD47015E634F3DB1B6B2A9DA3&dn=synapse_v1.74.0.tar"
)
FILE_MAGNETS=(
"${MAGNET_LINKS[0]}$MAG_TRACKERS"
"${MAGNET_LINKS[1]}$MAG_TRACKERS"
)
CONF_MAGNET=""
#CONF_MAGNET="$MAG_TRACKERS"
export HUB_REACHABLE=false
export DCOMM_REACHABLE=false
export IPFS_REACHABLE=false
export TOR_AVAIL=false
i=0
@ -88,22 +27,13 @@ check_requirements () {
printf "https://docs.docker.com/engine/install/${NC}\n"
exit 1
fi
if ! which aria2c>/dev/null; then
printf "${YELLOW}## This script requires aria2 to download torrents in "
printf "the event that Docker Hub or the dComms servers are unreachable.\n"
printf "If you require this functionality please install 'aria2'${NC}\n"
TORRENT_AVAIL=false
((i=i+=1))
else
TORRENT_AVAIL=true
fi
if which tor >/dev/null; then
if which torify >/dev/null; then
TOR_AVAIL=true
else
printf "${YELLOW}## This script can take advantage of Tor to route around "
printf "blockages and allow users to connect anonymously to your server.\n"
printf "If you would like this functionality enabled please install 'tor'"
printf "from your package manager and re-run the script.${NC}\n"
printf "If you would like this functionality enabled please install 'torsocks'"
printf " from your package manager and re-run the script.${NC}\n"
fi
}
@ -118,50 +48,13 @@ detect_connectivity () {
((i=i+=1))
fi
for site in ${DCOMMS_INSTANCES[@]}; do
#this function should be more complex
if curl -s -m 3 https://$site/dcomms/hashes.txt -o /tmp/dcomms; then
if (( $(stat -c %s /tmp/dcomms) > 3 )); then
DCOMM_URL=https://$site/dcomms
printf "${GREEN}## Successfully connected to $site${NC}\n"
DCOMM_REACHABLE=true
rm /tmp/dcomms
break
fi
rm /tmp/dcomms
fi
done
if [[ "${DCOMM_REACHABLE}" == false ]]; then
printf "${RED}## Unable to connect to dComms instance${NC}\n"
((i=i+=1))
fi
for site in ${IPFS_GATEWAYS[@]}; do
#this function should be more complex
if curl -s -m 30 https://$site/$IPFS_DIR/hashes.txt -o /tmp/dcomms; then
if (( $(stat -c %s /tmp/dcomms) > 3 )); then
IPFS_URL=https://$site/$IPFS_DIR
printf "${GREEN}## Successfully connected to $site${NC}\n"
IPFS_REACHABLE=true
rm /tmp/dcomms
break
fi
rm /tmp/dcomms
fi
done
if [[ "${IPFS_REACHABLE}" == false ]]; then
printf "${RED}## Unable to connect to IPFS gateway${NC}\n"
((i=i+=1))
fi
# 'i' is the number of failed methods. Change as needed
if (( i == 4 )); then
if (( i == 2 )); then
printf "\n\n${RED}## All methods of retrieving dComms docker images have failed\n"
printf "## Don't despair!\n"
printf "## If you manage to retrieve tarfiles of the images listed below\n"
printf "## place them in the $DCOMMS_DIR folder and re-run this script.\n"
printf "## Alternately, try configuring a VPN and re-try\n"
for i in ${D_IMAGES[@]}; do
printf "$i\n"
done
@ -182,17 +75,17 @@ matrix_config () {
matrixdotorg/synapse:v1.121.1 generate 2>/dev/null
sudo chown -R $USER:$USER $DCOMMS_DIR/conf/synapse/
sed -i -z "s/database.*homeserver.db//" $DCOMMS_DIR/conf/synapse/config.json
sed -i "s/# vim:ft=yaml//" $DCOMMS_DIR/conf/synapse/config.json
sed -i -z "s/database.*homeserver.db//" $DCOMMS_DIR/conf/synapse/homeserver.yaml
sed -i "s/# vim:ft=yaml//" $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "enable_registration: true\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "registration_requires_token: true\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "encryption_enabled_by_default_for_room_type: all\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "rc_registration:\n per_second: 0.1 \n burst_count: 2\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "presence:\n enabled: false\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "database:\n name: psycopg2\n txn_limit: 10000\n args:\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf " user: synapse\n password: null\n database: synapse\n host: localhost\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf " port: 5432\n cp_min: 5\n cp_max: 10\n" >> $DCOMMS_DIR/conf/synapse/config.json
printf "enable_registration: true\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "registration_requires_token: true\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "encryption_enabled_by_default_for_room_type: all\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "rc_registration:\n per_second: 0.1 \n burst_count: 2\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "presence:\n enabled: false\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf "database:\n name: psycopg2\n txn_limit: 10000\n args:\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf " user: synapse\n password: null\n database: synapse\n host: localhost\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
printf " port: 5432\n cp_min: 5\n cp_max: 10\n" >> $DCOMMS_DIR/conf/synapse/homeserver.yaml
sed -i "s/TEMPLATE/$DWEB_DOMAIN/" $DCOMMS_DIR/conf/element/config.json
}
@ -222,7 +115,7 @@ mastodon_config () {
ACTIVE_RECORD_ENCRYPTION=$(docker run --rm \
--mount type=volume,src=masto_data_tmp,dst=/opt/mastodon \
-e RUBYOPT=-W0 tootsuite/mastodon:v4.3.2 \
bundle exec rake db:encryption:init | last -3)>/dev/null
bundle exec rake db:encryption:init | tail -3)>/dev/null
ACTIVE_RECORD_ENCRYPTION_FRIENDLY_KEYS=${ACTIVE_RECORD_ENCRYPTION//$'\n'/\\$'\n'}
#REDIS_PW=$(openssl rand -base64 12)
@ -256,31 +149,6 @@ mau_config () {
sed -i "s/admins:/&\n admin: $MAU_PW/" $DCOMMS_DIR/conf/mau/config.yaml
}
grab_files () {
j=0
for file in ${FILES[@]}; do
if [ -f $DCOMMS_DIR/images/$file ]; then
printf "${GREEN}$file found on disk.${NC}\n"
elif [[ "${DCOMM_REACHABLE}" == true ]]; then
printf "${GREEN}Downloading $file using Dcomm mirror.${NC}\n"
curl $DCOMM_URL/$file -o $TMP_DIR_F/$file
elif [[ "${IPFS_REACHABLE}" == true ]]; then
printf "${GREEN}Downloading $file using IPFS.${NC}\n"
curl $IPFS_URL/$file -o $TMP_DIR_F/$file
elif [[ "${TORRENT_AVAIL}" == true ]]; then
printf "${GREEN}Downloading $file using torrent.${NC}\n"
aria2c -d $TMP_DIR_F/$file --seed-time=0 "${FILE_MAGNETS[$j]}" >/dev/null
fi
if (( j == 0 )); then
echo ""
tar -xvf $TMP_DIR_F/$file -C $DCOMMS_DIR >/dev/null
else
mv $TMP_DIR_F/$file $DCOMMS_DIR/images/$file
fi
((j=j+=1))
done
}
#The main function does most of the configuration
main() {
if [ -z $DCOMMS_DIR ]; then
@ -335,36 +203,26 @@ main() {
case "$CHOICE" in
"1")
D_IMAGES+=("keith/deltachat-mailadm-postfix:v0.0.3" "keith/deltachat-mailadm-dovecot:v0.0.1" "keith/deltachat-mailadm:v0.0.1")
FILES+=("deltachat-mailadm-dovecot_v0.0.1.tar" "deltachat-mailadm_v0.0.1.tar" "deltachat-mailadm-postfix_v0.0.3.tar")
FILE_MAGNETS+=("${MAGNET_LINKS[3]}$MAG_TRACKERS" "${MAGNET_LINKS[5]}$MAG_TRACKERS" "${MAGNET_LINKS[4]}$MAG_TRACKERS")
COMPOSE_FILES+="-f ./conf/compose/delta.docker-compose.yml "
DELTA=true
;;
"2")
D_IMAGES+=("vectorim/element-web:v1.11.88" "matrixdotorg/synapse:v1.121.1")
FILES+=("synapse_v1.80.0.tar" "element-web_v1.11.26.tar")
FILE_MAGNETS+=("${MAGNET_LINKS[11]}$MAG_TRACKERS" "${MAGNET_LINKS[6]}$MAG_TRACKERS")
COMPOSE_FILES+="-f ./conf/compose/element.docker-compose.yml "
MATRIX=true
;;
"3")
D_IMAGES+=("equalitie/ceno-client:v0.21.2")
FILES+=("ceno-client_v0.21.2.tar")
FILE_MAGNETS+=("${MAGNET_LINKS[2]}$MAG_TRACKERS")
COMPOSE_FILES+="-f ./conf/compose/bridge.docker-compose.yml "
CENO=true
;;
"4")
D_IMAGES+=("dock.mau.dev/maubot/maubot:v0.3.1")
FILES+=("maubot_v0.3.1.tar")
FILE_MAGNETS+=("${MAGNET_LINKS[8]}$MAG_TRACKERS")
COMPOSE_FILES+="-f ./conf/compose/mau.docker-compose.yml "
MAU=true
;;
"5")
D_IMAGES+=("tootsuite/mastodon:v4.3.2" "redis:7.0-alpine" "postgres:14-alpine")
FILES+=("mastodon_4.1.2.tar" "postgres_14.tar" "redis_7.0.tar")
FILE_MAGNETS+=("${MAGNET_LINKS[7]}$MAG_TRACKERS" "${MAGNET_LINKS[9]}$MAG_TRACKERS" "${MAGNET_LINKS[10]}$MAG_TRACKERS")
COMPOSE_FILES+="-f ./conf/compose/mastodon.docker-compose.yml "
MASTO=true
;;
@ -403,15 +261,19 @@ main() {
((di=di+=1))
fi
done
elif [[ "${HUB_REACHABLE}" == false ]] && [[ "${TOR_AVAIL}" == true ]]; then
di=1
printf "${GREEN}### Grabbing images from Docker Hub.${NC}\n"
for img in ${D_IMAGES[@]}; do
echo "dimg = $img"
if torify docker pull $img; then
unset 'FILES[$di]'
((di=di+=1))
fi
done
fi
#grab_files
#Might be wise to bring this out of this function so that we can validate before loading
# for f in $DCOMMS_DIR/images/*.tar; do
# echo ""
# cat $f | docker load
# done
echo "#!/bin/bash" > $DCOMMS_DIR/run.sh
if [[ "${MATRIX}" == true ]]; then