From 76ada40c275645ecd4cff698a143db91bb1a7c11 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 31 May 2023 16:20:27 +0000 Subject: [PATCH] Fixed mail settings postfix-main, added nextcloud external sites, fixed gitea repo creation --- lib/gitea.sh | 3 +-- lib/mail.sh | 2 +- lib/nextcloud.sh | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/gitea.sh b/lib/gitea.sh index e77ecea..189b83c 100644 --- a/lib/gitea.sh +++ b/lib/gitea.sh @@ -78,8 +78,7 @@ cat > /federated/apps/gitea/data/creategitea.sh </dev/null | awk -F: '{ pr -int \$4 }' | awk -F\" '{ print \$2 }'\` +GITEA_TOKEN_2=\`curl -H "Content-Type: application/json" -d '{"name":"gitea2","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 }'\` # Create the repository website, blog, and documentation curl -k -X POST http://gitea.$DOMAIN:3000/api/v1/user/repos -H "content-type: application/json" -H "Authorization: token \$GITEA_TOKEN_2" --data '{"name":"www","auto_init":true,"default_branch":"master"}' diff --git a/lib/mail.sh b/lib/mail.sh index c411d33..9a1594f 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -104,7 +104,7 @@ chmod 600 /federated/apps/mail/.env cat > /federated/apps/mail/data/tmp/docker-mailserver/postfix-main.cf <<'EOF' smtpd_sender_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_unknown_sender_domain, reject_sender_login_mismatch, reject_unknown_reverse_client_hostname, reject_unknown_client_hostname -smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_invalid_helo_hostname, check_policy_service unix:private/policyd-spf, reject_rhsbl_helo dbl.spamhaus.org, reject_rhsbl_reverse_client dbl.spamhaus.org, reject_rhsbl_sender dbl.spamhaus.org, reject_rbl_client zen.spamhaus.org +smtpd_recipient_restrictions = permit_sasl_authenticated, permit_mynetworks, reject_invalid_helo_hostname, check_policy_service unix:private/policyd-spf smtpd_sender_login_maps = ldap:/etc/postfix/ldap-aliases.cf smtpd_helo_restrictions = permit_mynetworks, permit_sasl_authenticated, reject_invalid_helo_hostname, reject_non_fqdn_helo_hostname, reject_unknown_helo_hostname EOF diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh index 3badd11..b486aff 100644 --- a/lib/nextcloud.sh +++ b/lib/nextcloud.sh @@ -211,11 +211,13 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin /var/www/html/occ app:enable forms /var/www/html/occ app:enable spreed /var/www/html/occ app:enable side_menu +/var/www/html/occ app:enable external /var/www/html/occ app:enable richdocuments /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments public_wopi_url /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments wopi_url /var/www/html/occ config:app:set --value ooxml richdocuments doc_format /var/www/html/occ config:app:set --value "" richdocuments disable_certificate_verification +/var/www/html/occ config:app:set external sites "--value={\"1\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":1,\"name\":\"Video Conference (Jitsi)\",\"url\":\"https:\/\/jitsi.$DOMAIN\"},\"2\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":2,\"name\":\"Worldwide Chat (Element)\",\"url\":\"https:\/\/element.$DOMAIN\"},\"3\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":3,\"name\":\"Mailing Lists (Listmonk)\",\"url\":\"https:\/\/listmonk.$DOMAIN\"},\"4\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":4,\"name\":\"Databases (Baserow)\",\"url\":\"https:\/\/baserow.$DOMAIN\"},\"5\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":5,\"name\":\"Passwords (Vaultwarden)\",\"url\":\"https:\/\/vaultwarden.$DOMAIN\"},\"7\":{\"icon\":\"external.svg\",\"lang\":\"\",\"type\":\"link\",\"device\":\"browser\",\"groups\":[],\"redirect\":true,\"id\":7,\"name\":\"Source code (Gitea)\",\"url\":\"https:\/\/gitea.$DOMAIN\"}}" /var/www/html/occ config:import configs.json EOF