diff --git a/fstack/lib/nextcloud.sh b/fstack/lib/nextcloud.sh index 20ee447..c8e4a31 100644 --- a/fstack/lib/nextcloud.sh +++ b/fstack/lib/nextcloud.sh @@ -9,15 +9,16 @@ config_nextcloud() { spin & SPINPID=$! -# if [ ! -d "fstack/nextcloud" ]; then + if [ ! -d "fstack/nextcloud" ]; then mkdir -p fstack/nextcloud/data/root/certs &> /dev/null mkdir -p fstack/nextcloud/data/var/www/html &> /dev/null + mkdir -p fstack/nextcloud/data/etc/apache2/sites-enabled &> /dev/null cp -rf fstack/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem fstack/nextcloud/data/root/certs/ -# fi + fi - DOMAIN_ARRAY=(${DOMAIN//./ }) - DOMAIN_FIRST=${DOMAIN_ARRAY[0]} - DOMAIN_LAST=${DOMAIN_ARRAY[1]} +# DOMAIN_ARRAY=(${DOMAIN//./ }) +# DOMAIN_FIRST=${DOMAIN_ARRAY[0]} +# DOMAIN_LAST=${DOMAIN_ARRAY[1]} cat > fstack/nextcloud/docker-compose.yml <<EOF version: '3.8' @@ -34,16 +35,15 @@ services: ipv4_address: 172.99.0.15 ports: - "8000:80" + - "8444:443" volumes: - ./data/root:/root + - ./data/etc/apache2/sites-enabled:/etc/apache2/sites-enabled - ./data/var/www/html:/var/www/html environment: - SQLITE_DATABASE=db1 - NEXTCLOUD_ADMIN_USER=nextcloud - NEXTCLOUD_ADMIN_PASSWORD=$ADMINPASS - # - NEXTCLOUD_TRUSTED_DOMAINS=northendnetwork.com - # - VIRTUAL_HOST=nextcloud.northendnetwork.com - # - NEXTCLOUD_LDAP_HOST=ldap.northendnetwork.com networks: fstack: @@ -91,10 +91,42 @@ cat > fstack/nextcloud/data/root/nextcloud.sh <<EOF ./occ ldap:set-config s01 ldapConfigurationActive 1 ./occ config:system:delete trusted_domains ./occ config:system:set trusted_domains 1 --value=* +./occ app:enable calendar +./occ app:enable contacts +./occ app:enable notes +./occ app:enable deck +./occ app:enable tasks +./occ app:enable bookmarks +./occ app:enable forms +./occ app:enable appointments +./occ app:enable news +./occ app:enable spreed EOF chmod +x fstack/nextcloud/data/root/nextcloud.sh +cat > fstack/nextcloud/data/etc/apache2/sites-enabled/000-default.conf <<'EOF' +LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so + +<VirtualHost *:80> + ServerAdmin admin@localhost + DocumentRoot /var/www/html + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined +</VirtualHost> + +<VirtualHost *:443> + SSLEngine on + SSLCertificateFile /root/certs/fullchain1.pem + SSLCertificateKeyFile /root/certs/privkey1.pem + + ServerAdmin admin@localhost + DocumentRoot /var/www/html + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined +</VirtualHost> +EOF + kill -9 $SPINPID &> /dev/null echo -ne "done." } @@ -130,7 +162,7 @@ start_nextcloud() { done fi - # Set nextcloud.sh executable + # Move nextcloud.sh and set nextcloud.sh executable docker exec -it nextcloud mv /root/nextcloud.sh /var/www/html/ docker exec -it nextcloud chown www-data:root /var/www/html/nextcloud.sh docker exec -it nextcloud chmod 755 /var/www/html/nextcloud.sh