bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Took out -it on files

Browse Source
This commit is contained in:
root 2023-06-15 19:53:15 +00:00
parent 34f8426713
commit b86210d89a
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/baserow.sh
View File

@ -82,19 +82,19 @@ echo -ne "done."
start_baserow() {
# Start service with command to make sure it's up before proceeding
start_service "baserow" "docker exec -it baserow curl http://localhost:8000 &> /dev/null"
start_service "baserow" "docker exec baserow curl http://localhost:8000 &> /dev/null"
# Move createuser.sh and set it executable
mv /federated/apps/baserow/data/createuser.sh /federated/apps/baserow/data/baserow/data/
docker exec -it baserow chmod 755 /baserow/data/createuser.sh
docker exec baserow chmod 755 /baserow/data/createuser.sh
[ $? -ne 0 ] && fail "Couldn't chown createuser.sh in /federated/apps/baserow container"
# Run createuser.sh inside baserow container
docker exec -it baserow /baserow/data/createuser.sh
docker exec baserow /baserow/data/createuser.sh
[ $? -ne 0 ] && fail "Couldn't run createuser.sh in /federated/apps/baserow container"
# Disable new sign ups
docker exec -it postgresql psql -U baserow -c "update core_settings set allow_new_signups='f' where allow_new_signups='t';"
docker exec postgresql psql -U baserow -c "update core_settings set allow_new_signups='f' where allow_new_signups='t';"
kill -9 $SPINPID &> /dev/null
echo -ne "done."

6
lib/functions.sh
View File

@ -399,8 +399,8 @@ It's your computer. Let's make it work for you!
EOF
# Send out e-mail from mail container with details
docker exec -it mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN < /root/certs/mailfile"
docker exec -it mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$EMAIL < /root/certs/mailfile"
docker exec mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN < /root/certs/mailfile"
docker exec mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$EMAIL < /root/certs/mailfile"
cat /federated/apps/mail/data/root/certs/mailfile
rm /federated/apps/mail/data/root/certs/mailfile
}
@ -462,7 +462,7 @@ https://documentation.federated.computer/users.
EOF
# Send out e-mail from mail container with details
docker exec -it mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN < /root/certs/mailfile"
docker exec mail bash -c "mail -r admin@$DOMAIN -s \"Welcome to Federated\" admin@$DOMAIN < /root/certs/mailfile"
cat /federated/apps/mail/data/root/certs/mailfile
rm /federated/apps/mail/data/root/certs/mailfile
}

4
lib/gitea.sh
View File

@ -173,11 +173,11 @@ start_gitea() {
[ $? -ne 0 ] && fail "Couldn't run gitea user create inside /federated/apps/gitea container"
# Run creategitea.sh inside gitea container
docker exec -it gitea /data/creategitea.sh &> /dev/null
docker exec gitea /data/creategitea.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run creategitea.sh inside /federated/apps/gitea container"
# Create token to use for Caddy starting up next
GITEA_TOKEN_1=`docker exec -it gitea curl -H "Content-Type: application/json" -d '{"name":"gitea1","scopes":["all"]}' -u gitea:$ADMINPASS http://gitea.$DOMAIN:3000/api/v1/users/gitea/tokens 2>/dev/null | awk -F: '{ print $4 }' | awk -F\" '{ print $2 }'` &> /dev/null
GITEA_TOKEN_1=`docker exec gitea curl -H "Content-Type: application/json" -d '{"name":"gitea1","scopes":["all"]}' -u gitea:$ADMINPASS http://gitea.$DOMAIN:3000/api/v1/users/gitea/tokens 2>/dev/null | awk -F: '{ print $4 }' | awk -F\" '{ print $2 }'` &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run gitea curl to get token inside /federated/apps/gitea container"
kill -9 $SPINPID &> /dev/null

2
lib/ldap.sh
View File

@ -166,7 +166,7 @@ start_ldap() {
# Run our ldap.sh script inside the ldap container
# This imports the inital LDAP configuration
docker exec -it ldap /root/ldap.sh &> /dev/null
docker exec ldap /root/ldap.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run ldap.sh inside ldap container"
kill -9 $SPINPID &> /dev/null

6
lib/listmonk.sh
View File

@ -76,9 +76,9 @@ start_listmonk() {
docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
# Change app.root_url and other settings to our domain
docker exec -it postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null
docker exec -it postgresql psql -U listmonk -c "update settings set value='\"listmonk <listmonk@listmonk.$DOMAIN>\"' where key='app.from_email'" &> /dev/null
docker exec -it postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"admin\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null
docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null
docker exec postgresql psql -U listmonk -c "update settings set value='\"listmonk <listmonk@listmonk.$DOMAIN>\"' where key='app.from_email'" &> /dev/null
docker exec postgresql psql -U listmonk -c "update settings set value='[{\"host\": \"mail.$DOMAIN\", \"port\": 587, \"enabled\": true, \"password\": \"$ADMINPASS\", \"tls_type\": \"STARTTLS\", \"username\": \"admin\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}, {\"host\": \"smtp.gmail.com\", \"port\": 465, \"enabled\": false, \"password\": \"password\", \"tls_type\": \"TLS\", \"username\": \"username@gmail.com\", \"max_conns\": 10, \"idle_timeout\": \"15s\", \"wait_timeout\": \"5s\", \"auth_protocol\": \"login\", \"email_headers\": [], \"hello_hostname\": \"\", \"max_msg_retries\": 2, \"tls_skip_verify\": false}]' where key='smtp';" &> /dev/null
# Grab the container IP from docker-compose above
SERVICE_IP=`grep ipv4_address /federated/apps/listmonk/docker-compose.yml | awk '{ print $2 }'`

10
lib/mail.sh
View File

@ -160,21 +160,21 @@ start_mail() {
start_service "mail" "nc -z $SERVICE_IP 25 &> /dev/null"
# Generate the DKIM DNS key and setup
docker exec -it mail setup config dkim
docker exec -it mail setup config dkim keysize 2048 domain $DOMAIN &> /dev/null
docker exec mail setup config dkim
docker exec mail setup config dkim keysize 2048 domain $DOMAIN &> /dev/null
[ $? -ne 0 ] && fail "Couldn't generate DKIM record"
docker exec -it mail bash -c "setup config dkim domain '$DOMAIN'"
docker exec mail bash -c "setup config dkim domain '$DOMAIN'"
[ $? -ne 0 ] && fail "Couldn't setup DKIM domain"
# Insert the DKIM DNS TXT entry into /federated/apps/pdns container
DKIM_RECORD_STRIP=`cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt | sed 's/.*(//'`
DKIM_RECORD=`echo $DKIM_RECORD_STRIP | sed 's/).*//'`
docker exec -it pdns pdnsutil add-record $DOMAIN mail._domainkey TXT 86400 "$DKIM_RECORD" &> /dev/null
docker exec pdns pdnsutil add-record $DOMAIN mail._domainkey TXT 86400 "$DKIM_RECORD" &> /dev/null
[ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/pdns container"
# Insert the DMARC DNS TXT entry into /federated/apps/pdns container
docker exec -it pdns pdnsutil add-record $DOMAIN _dmarc TXT 86400 "\"v=DMARC1; p=quarantine; rua=mailto:admin@$DOMAIN; ruf=mailto:admin@$DOMAIN; sp=none; ri=86400\"" &> /dev/null
docker exec pdns pdnsutil add-record $DOMAIN _dmarc TXT 86400 "\"v=DMARC1; p=quarantine; rua=mailto:admin@$DOMAIN; ruf=mailto:admin@$DOMAIN; sp=none; ri=86400\"" &> /dev/null
[ $? -ne 0 ] && fail "Couldn't insert DMARC record into /federated/apps/pdns container"
# Stop and Start mail to reload DKIM

2
lib/matrix.sh
View File

@ -51,7 +51,7 @@ chmod 600 /federated/apps/matrix/.env
LDAP_SECRET=`cat /federated/apps/ldap/.ldap.secret`
# Generate the matrix homeserver.yaml file
docker run -it --rm -v "/federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=matrix.$DOMAIN -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /dev/null
docker run --rm -v "/federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=matrix.$DOMAIN -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run docker matrixdotorg/synapse:latest generate"
# Take out default Sqlite database config

10
lib/nextcloud.sh
View File

@ -260,19 +260,19 @@ start_nextcloud() {
# Move config.sh and sidemenu config, set config.sh executable
mv /federated/apps/nextcloud/data/config.sh /federated/apps/nextcloud/data/configs.json /federated/apps/nextcloud/data/var/www/html/
docker exec -it nextcloud chown www-data:root /var/www/html/config.sh /var/www/html/configs.json
docker exec -it nextcloud chmod 755 /var/www/html/config.sh
docker exec nextcloud chown www-data:root /var/www/html/config.sh /var/www/html/configs.json
docker exec nextcloud chmod 755 /var/www/html/config.sh
[ $? -ne 0 ] && fail "Couldn't chown config.sh in /federated/apps/nextcloud container"
# Run config.sh - Setup LDAP, configuration for nextcloud
docker exec -it -u 33 nextcloud /var/www/html/config.sh &> /dev/null
docker exec -u 33 nextcloud /var/www/html/config.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run config.sh inside /federated/apps/nextcloud container"
# Add admin user to group
docker exec -it -u 33 nextcloud /var/www/html/occ group:adduser admin admin &> /dev/null
docker exec -u 33 nextcloud /var/www/html/occ group:adduser admin admin &> /dev/null
# Setup admin email account
docker exec -it -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password" &> /dev/null
docker exec -u 33 nextcloud bash -c "/var/www/html/occ mail:account:create admin admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."

22
lib/pdns.sh
View File

@ -106,23 +106,23 @@ start_pdns() {
start_service "pdns" "nc -z ${SERVICE_IP} 8081 &> /dev/null"
# Create DNS records for newdomain
docker exec -it pdns pdnsutil create-zone $DOMAIN
docker exec -it pdns pdnsutil set-kind $DOMAIN native
docker exec -it pdns pdnsutil set-meta $DOMAIN SOA-EDIT-API DEFAULT
docker exec pdns pdnsutil create-zone $DOMAIN
docker exec pdns pdnsutil set-kind $DOMAIN native
docker exec pdns pdnsutil set-meta $DOMAIN SOA-EDIT-API DEFAULT
for i in ns1 ns2 powerdns traefik mail www computer panel nextcloud collabora jitsi matrix element listmonk vaultwarden vpn wireguard baserow gitea blog documentation; do
docker exec -it pdns pdnsutil add-record $DOMAIN $i A 86400 $EXTERNALIP
docker exec pdns pdnsutil add-record $DOMAIN $i A 86400 $EXTERNALIP
done
docker exec -it pdns pdnsutil add-record $DOMAIN @ NS ns1.$DOMAIN_NEW
docker exec -it pdns pdnsutil add-record $DOMAIN @ NS ns2.$DOMAIN_NEW
docker exec -it pdns pdnsutil add-record $DOMAIN @ MX 86400 "10 mail.$DOMAIN"
docker exec -it pdns pdnsutil add-record $DOMAIN @ TXT 86400 "\"v=spf1 mx a:$DOMAIN ~all\""
docker exec -it pdns pdnsutil add-record $DOMAIN \* CNAME 86400 www.$DOMAIN
docker exec -it pdns pdnsutil add-record $DOMAIN @ A 86400 $EXTERNALIP
docker exec pdns pdnsutil add-record $DOMAIN @ NS ns1.$DOMAIN_NEW
docker exec pdns pdnsutil add-record $DOMAIN @ NS ns2.$DOMAIN_NEW
docker exec pdns pdnsutil add-record $DOMAIN @ MX 86400 "10 mail.$DOMAIN"
docker exec pdns pdnsutil add-record $DOMAIN @ TXT 86400 "\"v=spf1 mx a:$DOMAIN ~all\""
docker exec pdns pdnsutil add-record $DOMAIN \* CNAME 86400 www.$DOMAIN
docker exec pdns pdnsutil add-record $DOMAIN @ A 86400 $EXTERNALIP
# Run createrecords.sh inside baserow container
# docker exec -it pdns /root/createrecords.sh &> /dev/null
# docker exec pdns /root/createrecords.sh &> /dev/null
# [ $? -ne 0 ] && fail "Couldn't run createrecords.sh in /federated/apps/pdns container"
kill -9 $SPINPID &> /dev/null

2
lib/pdnsadmin.sh
View File

@ -100,7 +100,7 @@ start_pdnsadmin() {
start_service "pdnsadmin" "nc -z ${SERVICE_IP} 9494 &> /dev/null"
# Run MySQL command to create admin user for pdns admin interface
docker exec -it pdnsmysql bash -c "mysql -updns -p$MYSQL_PASSWORD pdns -e '$PDNS_MYSQL_COMMAND;'"
docker exec pdnsmysql bash -c "mysql -updns -p$MYSQL_PASSWORD pdns -e '$PDNS_MYSQL_COMMAND;'"
kill -9 $SPINPID &> /dev/null
echo -ne "done."