From 634718ea5524ff591aa9f7d4fbfdb840cf465c8d Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 5 Jan 2021 17:35:59 +0000 Subject: [PATCH] 10.6.0-debian-10-r18 release --- bitnami/owncloud/10/debian-10/Dockerfile | 55 +- .../owncloud/10/debian-10/docker-compose.yml | 18 +- .../prebuildfs/build/bitnami-user.sh | 6 - .../prebuildfs/build/install-nami.sh | 7 - .../opt/bitnami/.bitnami_components.json | 10 +- .../prebuildfs/opt/bitnami/base/functions | 120 --- .../prebuildfs/opt/bitnami/base/helpers | 40 - .../opt/bitnami/scripts/libbitnami.sh | 51 + .../opt/bitnami/scripts/libcomponent.sh | 65 ++ .../prebuildfs/opt/bitnami/scripts/libfile.sh | 80 ++ .../prebuildfs/opt/bitnami/scripts/libfs.sh | 183 ++++ .../prebuildfs/opt/bitnami/scripts/liblog.sh | 110 ++ .../prebuildfs/opt/bitnami/scripts/libnet.sh | 142 +++ .../prebuildfs/opt/bitnami/scripts/libos.sh | 291 ++++++ .../opt/bitnami/scripts/libpersistence.sh | 122 +++ .../opt/bitnami/scripts/libservice.sh | 225 ++++ .../opt/bitnami/scripts/libvalidations.sh | 248 +++++ .../opt/bitnami/scripts/libversion.sh | 49 + .../opt/bitnami/scripts/libwebserver.sh | 421 ++++++++ .../debian-10/prebuildfs/usr/sbin/bitnami-pkg | 222 ---- .../10/debian-10/rootfs/apache-init.sh | 24 - .../10/debian-10/rootfs/apache-inputs.json | 5 - .../10/debian-10/rootfs/app-entrypoint.sh | 15 - .../debian-10/rootfs/mysql-client-inputs.json | 13 - .../apache/conf/bitnami/certs/server.crt | 17 + .../apache/conf/bitnami/certs/server.key | 27 + .../opt/bitnami/apache/conf/deflate.conf | 5 + .../apache/conf/vhosts/00_status-vhost.conf | 7 + .../rootfs/opt/bitnami/scripts/apache-env.sh | 69 ++ .../scripts/apache-modphp/postunpack.sh | 30 + .../app-generic-http-vhost.conf.tpl | 5 + .../app-generic-https-vhost.conf.tpl | 8 + .../app-generic-prefix.conf.tpl | 1 + .../bitnami-templates/app-http-vhost.conf.tpl | 13 + .../app-https-vhost.conf.tpl | 16 + .../bitnami-templates/app-prefix.conf.tpl | 9 + .../app-ruby-passenger-http-vhost.conf.tpl | 14 + .../app-ruby-passenger-https-vhost.conf.tpl | 17 + .../app-ruby-passenger-prefix.conf.tpl | 9 + .../bitnami-templates/bitnami-ssl.conf.tpl | 29 + .../apache/bitnami-templates/bitnami.conf.tpl | 18 + .../opt/bitnami/scripts/apache/entrypoint.sh | 27 + .../opt/bitnami/scripts/apache/postunpack.sh | 115 ++ .../opt/bitnami/scripts/apache/reload.sh | 18 + .../opt/bitnami/scripts/apache/restart.sh | 17 + .../rootfs/opt/bitnami/scripts/apache/run.sh | 18 + .../opt/bitnami/scripts/apache/setup.sh | 26 + .../opt/bitnami/scripts/apache/start.sh | 32 + .../opt/bitnami/scripts/apache/status.sh | 21 + .../rootfs/opt/bitnami/scripts/apache/stop.sh | 32 + .../rootfs/opt/bitnami/scripts/libapache.sh | 687 ++++++++++++ .../opt/bitnami/scripts/libmysqlclient.sh | 988 ++++++++++++++++++ .../rootfs/opt/bitnami/scripts/libowncloud.sh | 446 ++++++++ .../rootfs/opt/bitnami/scripts/libphp.sh | 238 +++++ .../opt/bitnami/scripts/mysql-client-env.sh | 85 ++ .../scripts/mysql-client/postunpack.sh | 19 + .../opt/bitnami/scripts/mysql-client/setup.sh | 19 + .../opt/bitnami/scripts/owncloud-env.sh | 110 ++ .../bitnami/scripts/owncloud/entrypoint.sh | 31 + .../bitnami/scripts/owncloud/postunpack.sh | 46 + .../opt/bitnami/scripts/owncloud/run.sh | 44 + .../opt/bitnami/scripts/owncloud/setup.sh | 39 + .../bitnami/scripts/owncloud/updatehost.sh | 25 + .../rootfs/opt/bitnami/scripts/php-env.sh | 74 ++ .../opt/bitnami/scripts/php/postunpack.sh | 38 + .../rootfs/opt/bitnami/scripts/php/reload.sh | 35 + .../rootfs/opt/bitnami/scripts/php/restart.sh | 17 + .../rootfs/opt/bitnami/scripts/php/run.sh | 19 + .../rootfs/opt/bitnami/scripts/php/setup.sh | 32 + .../rootfs/opt/bitnami/scripts/php/start.sh | 32 + .../rootfs/opt/bitnami/scripts/php/status.sh | 21 + .../rootfs/opt/bitnami/scripts/php/stop.sh | 32 + .../10/debian-10/rootfs/owncloud-inputs.json | 12 - bitnami/owncloud/README.md | 615 ++++++----- bitnami/owncloud/docker-compose.yml | 18 +- 75 files changed, 6071 insertions(+), 773 deletions(-) delete mode 100755 bitnami/owncloud/10/debian-10/prebuildfs/build/bitnami-user.sh delete mode 100755 bitnami/owncloud/10/debian-10/prebuildfs/build/install-nami.sh delete mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/functions delete mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/helpers create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh create mode 100644 bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh delete mode 100755 bitnami/owncloud/10/debian-10/prebuildfs/usr/sbin/bitnami-pkg delete mode 100644 bitnami/owncloud/10/debian-10/rootfs/apache-init.sh delete mode 100644 bitnami/owncloud/10/debian-10/rootfs/apache-inputs.json delete mode 100755 bitnami/owncloud/10/debian-10/rootfs/app-entrypoint.sh delete mode 100644 bitnami/owncloud/10/debian-10/rootfs/mysql-client-inputs.json create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/deflate.conf create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-http-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/entrypoint.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/run.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libapache.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libowncloud.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libphp.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/mysql-client-env.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/mysql-client/postunpack.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/mysql-client/setup.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud-env.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/entrypoint.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/postunpack.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/run.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/setup.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/updatehost.sh create mode 100644 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php-env.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/postunpack.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/run.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/setup.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/start.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/status.sh create mode 100755 bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh delete mode 100644 bitnami/owncloud/10/debian-10/rootfs/owncloud-inputs.json diff --git a/bitnami/owncloud/10/debian-10/Dockerfile b/bitnami/owncloud/10/debian-10/Dockerfile index 7329abbf8a92..9273a67b1f38 100644 --- a/bitnami/owncloud/10/debian-10/Dockerfile +++ b/bitnami/owncloud/10/debian-10/Dockerfile @@ -1,32 +1,40 @@ FROM docker.io/bitnami/minideb:buster LABEL maintainer "Bitnami " -ENV PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/nami/bin:$PATH" +ENV HOME="/" \ + OS_ARCH="amd64" \ + OS_FLAVOUR="debian-10" \ + OS_NAME="linux" COPY prebuildfs / # Install required system packages and dependencies -RUN install_packages ca-certificates curl gzip libargon2-1 libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps sudo tar zlib1g -RUN /build/bitnami-user.sh -RUN /build/install-nami.sh -RUN bitnami-pkg unpack php-7.3.25-3 --checksum 3da11e4b172bcb955da1fcb75830fdc068994bcf32c547d82920bed8798c61ba -RUN bitnami-pkg unpack apache-2.4.46-4 --checksum 35f10bccc2a1e55c050c9c483e28ee729e11f873acadd327d7361b53938a0101 -RUN bitnami-pkg unpack mysql-client-10.3.27-0 --checksum f96905e763a6334b75a7cdb07f8d89658cde02be41cb09d91d0682fc649fdcff -RUN bitnami-pkg install libphp-7.3.25-1 --checksum 830db27d5ba104e6927e9f32626be713d562ffd10ffc4791b54bae36ad6a0947 -RUN bitnami-pkg install tini-0.19.0-1 --checksum 9b1f1c095944bac88a62c1b63f3bff1bb123aa7ccd371c908c0e5b41cec2528d -RUN bitnami-pkg unpack owncloud-10.6.0-0 --checksum deb7841bf81e5197b79bf183890a5d7ad99e57c2706091e401d4c0f6ce4ac0ab -RUN bitnami-pkg install gosu-1.12.0-2 --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 +RUN install_packages acl ca-certificates cron curl gzip jq libargon2-1 libaudit1 libbsd0 libbz2-1.0 libc6 libcap-ng0 libcom-err2 libcurl4 libexpat1 libffi6 libfftw3-double3 libfontconfig1 libfreetype6 libgcc1 libgcrypt20 libglib2.0-0 libgmp10 libgnutls30 libgomp1 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu63 libidn2-0 libjemalloc2 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblcms2-2 libldap-2.4-2 liblqr-1-0 libltdl7 liblzma5 libmagickcore-6.q16-6 libmagickwand-6.q16-6 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses6 libnettle6 libnghttp2-14 libp11-kit0 libpam0g libpcre3 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libsqlite3-0 libssh2-1 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5deb1 libtinfo6 libunistring2 libuuid1 libx11-6 libxau6 libxcb1 libxdmcp6 libxext6 libxml2 libxslt1.1 libzip4 procps tar zlib1g +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "php" "7.3.25-5" --checksum 64a395833771f3ca776d455ad9eb0838bf1c9e04ae328ec2dd1ebd85235a4ee7 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "apache" "2.4.46-4" --checksum 35f10bccc2a1e55c050c9c483e28ee729e11f873acadd327d7361b53938a0101 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "mysql-client" "10.3.27-0" --checksum f96905e763a6334b75a7cdb07f8d89658cde02be41cb09d91d0682fc649fdcff +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "libphp" "7.3.25-1" --checksum 830db27d5ba104e6927e9f32626be713d562ffd10ffc4791b54bae36ad6a0947 +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "render-template" "1.0.0-3" --checksum 8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "owncloud" "10.6.0-0" --checksum deb7841bf81e5197b79bf183890a5d7ad99e57c2706091e401d4c0f6ce4ac0ab +RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50 RUN apt-get update && apt-get upgrade -y && \ rm -r /var/lib/apt/lists /var/cache/apt/archives +RUN chmod g+rwX /opt/bitnami +RUN sed -i -e '/pam_loginuid.so/ s/^#*/#/' /etc/pam.d/cron RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log && \ ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log COPY rootfs / +RUN /opt/bitnami/scripts/mysql-client/postunpack.sh +RUN /opt/bitnami/scripts/php/postunpack.sh +RUN /opt/bitnami/scripts/apache/postunpack.sh +RUN /opt/bitnami/scripts/apache-modphp/postunpack.sh +RUN /opt/bitnami/scripts/owncloud/postunpack.sh ENV ALLOW_EMPTY_PASSWORD="no" \ APACHE_ENABLE_CUSTOM_PORTS="no" \ - APACHE_HTTPS_PORT_NUMBER="443" \ - APACHE_HTTP_PORT_NUMBER="80" \ + APACHE_HTTPS_PORT_NUMBER="" \ + APACHE_HTTP_PORT_NUMBER="" \ BITNAMI_APP_NAME="owncloud" \ - BITNAMI_IMAGE_VERSION="10.6.0-debian-10-r17" \ + BITNAMI_IMAGE_VERSION="10.6.0-debian-10-r18" \ MARIADB_HOST="mariadb" \ MARIADB_PORT_NUMBER="3306" \ MARIADB_ROOT_PASSWORD="" \ @@ -37,19 +45,10 @@ ENV ALLOW_EMPTY_PASSWORD="no" \ MYSQL_CLIENT_CREATE_DATABASE_USER="" \ MYSQL_CLIENT_ENABLE_SSL="no" \ MYSQL_CLIENT_SSL_CA_FILE="" \ - OS_ARCH="amd64" \ - OS_FLAVOUR="debian-10" \ - OS_NAME="linux" \ - OWNCLOUD_DATABASE_NAME="bitnami_owncloud" \ - OWNCLOUD_DATABASE_PASSWORD="" \ - OWNCLOUD_DATABASE_USER="bn_owncloud" \ - OWNCLOUD_EMAIL="user@example.com" \ - OWNCLOUD_HOST="" \ - OWNCLOUD_PASSWORD="bitnami" \ - OWNCLOUD_USERNAME="user" \ - PHP_MEMORY_LIMIT="512M" + PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/apache/bin:/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:$PATH" -EXPOSE 80 443 +EXPOSE 8080 8443 -ENTRYPOINT [ "/app-entrypoint.sh" ] -CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ] +USER root +ENTRYPOINT [ "/opt/bitnami/scripts/owncloud/entrypoint.sh" ] +CMD [ "/opt/bitnami/scripts/owncloud/run.sh" ] diff --git a/bitnami/owncloud/10/debian-10/docker-compose.yml b/bitnami/owncloud/10/debian-10/docker-compose.yml index 2f657a75a98d..ffb47aa84f3c 100644 --- a/bitnami/owncloud/10/debian-10/docker-compose.yml +++ b/bitnami/owncloud/10/debian-10/docker-compose.yml @@ -3,28 +3,28 @@ services: mariadb: image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: + - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_owncloud - MARIADB_DATABASE=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes volumes: - - 'mariadb_data:/bitnami' + - 'mariadb_data:/bitnami/mariadb' owncloud: image: 'docker.io/bitnami/owncloud:10-debian-10' + ports: + - '80:8080' + - '443:8443' environment: - - MARIADB_HOST=mariadb - - MARIADB_PORT_NUMBER=3306 + - OWNCLOUD_DATABASE_HOST=mariadb + - OWNCLOUD_DATABASE_PORT_NUMBER=3306 - OWNCLOUD_DATABASE_USER=bn_owncloud - OWNCLOUD_DATABASE_NAME=bitnami_owncloud - ALLOW_EMPTY_PASSWORD=yes - # Host for accessing OwnCloud + # Host for accessing ownCloud # note: this setting will only be applied on the first run # ref: https://github.com/bitnami/bitnami-docker-owncloud#configuration - OWNCLOUD_HOST=localhost - ports: - - '80:80' - - '443:443' volumes: - - 'owncloud_data:/bitnami' + - 'owncloud_data:/bitnami/owncloud' depends_on: - mariadb volumes: diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/build/bitnami-user.sh b/bitnami/owncloud/10/debian-10/prebuildfs/build/bitnami-user.sh deleted file mode 100755 index 0b21a219a4f3..000000000000 --- a/bitnami/owncloud/10/debian-10/prebuildfs/build/bitnami-user.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -useradd -ms /bin/bash bitnami -mkdir -p /opt/bitnami -sed -i -e 's/\s*Defaults\s*secure_path\s*=/# Defaults secure_path=/' /etc/sudoers -echo 'bitnami ALL=NOPASSWD: ALL' >> /etc/sudoers diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/build/install-nami.sh b/bitnami/owncloud/10/debian-10/prebuildfs/build/install-nami.sh deleted file mode 100755 index d6ab4bd87f9c..000000000000 --- a/bitnami/owncloud/10/debian-10/prebuildfs/build/install-nami.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -curl --silent -L https://nami-prod.s3.amazonaws.com/tools/nami/releases/nami-2.0.1-0-linux-x64.tar.gz > /tmp/nami-linux-x64.tar.gz -echo "05e6e1e86cbb419cd80f832650ad06d97bcabca2c3a9e953e81b2674a29cc94e /tmp/nami-linux-x64.tar.gz" | sha256sum --check -mkdir -p /opt/bitnami/nami /opt/bitnami/licenses -tar xzf /tmp/nami-linux-x64.tar.gz --strip 1 -C /opt/bitnami/nami && rm /tmp/nami-linux-x64.tar.gz -curl --silent -L https://raw.githubusercontent.com/bitnami/nami/master/COPYING > /opt/bitnami/licenses/nami-2.0.1-0.txt diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json index a8a0f7335675..db011242aa9f 100644 --- a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json @@ -36,16 +36,16 @@ }, "php": { "arch": "amd64", - "digest": "3da11e4b172bcb955da1fcb75830fdc068994bcf32c547d82920bed8798c61ba", + "digest": "64a395833771f3ca776d455ad9eb0838bf1c9e04ae328ec2dd1ebd85235a4ee7", "distro": "debian-10", "type": "NAMI", - "version": "7.3.25-3" + "version": "7.3.25-5" }, - "tini": { + "render-template": { "arch": "amd64", - "digest": "9b1f1c095944bac88a62c1b63f3bff1bb123aa7ccd371c908c0e5b41cec2528d", + "digest": "8179ad1371c9a7d897fe3b1bf53bbe763f94edafef19acad2498dd48b3674efe", "distro": "debian-10", "type": "NAMI", - "version": "0.19.0-1" + "version": "1.0.0-3" } } \ No newline at end of file diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/functions b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/functions deleted file mode 100644 index c0eaff78f63e..000000000000 --- a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/functions +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -[[ ${BASH_DEBUG:-false} = true ]] && set -x - -# Constants -MODULE="$(basename "$0")" -BITNAMI_PREFIX=/opt/bitnami - -# Color Palette -RESET='\033[0m' -BOLD='\033[1m' - -## Foreground -BLACK='\033[38;5;0m' -RED='\033[38;5;1m' -GREEN='\033[38;5;2m' -YELLOW='\033[38;5;3m' -BLUE='\033[38;5;4m' -MAGENTA='\033[38;5;5m' -CYAN='\033[38;5;6m' -WHITE='\033[38;5;7m' - -## Background -ON_BLACK='\033[48;5;0m' -ON_RED='\033[48;5;1m' -ON_GREEN='\033[48;5;2m' -ON_YELLOW='\033[48;5;3m' -ON_BLUE='\033[48;5;4m' -ON_MAGENTA='\033[48;5;5m' -ON_CYAN='\033[48;5;6m' -ON_WHITE='\033[48;5;7m' - -# Functions - -######################## -# Print to STDERR -# Arguments: -# Message to print -# Returns: -# None -######################### -stderr_print() { - printf "%b\\n" "${*}" >&2 -} - -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -log() { - stderr_print "${NAMI_DEBUG:+${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")}${RESET}${*}" -} -######################## -# Log an 'info' message -# Arguments: -# Message to log -# Returns: -# None -######################### -info() { - log "${GREEN}INFO ${RESET} ==> ${*}" -} -######################## -# Log message -# Arguments: -# Message to log -# Returns: -# None -######################### -warn() { - log "${YELLOW}WARN ${RESET} ==> ${*}" -} -######################## -# Log an 'error' message -# Arguments: -# Message to log -# Returns: -# None -######################### -error() { - log "${RED}ERROR${RESET} ==> ${*}" -} -######################## -# Print the welcome page -# Globals: -# DISABLE_WELCOME_MESSAGE -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_welcome_page() { - if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then - if [[ -n "$BITNAMI_APP_NAME" ]]; then - print_image_welcome_page - fi - fi -} -######################## -# Print the welcome page for a Bitnami Docker image -# Globals: -# BITNAMI_APP_NAME -# Arguments: -# None -# Returns: -# None -######################### -print_image_welcome_page() { - local github_url="https://github.com/bitnami/bitnami-docker-${BITNAMI_APP_NAME}" - - log "" - log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" - log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" - log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" - log "" -} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/helpers b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/helpers deleted file mode 100644 index da35a1975ec6..000000000000 --- a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/base/helpers +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /opt/bitnami/base/functions - -######################## -# Helper function to initialize a single nami module -# Arguments: -# Module to initialize -# Returns: -# None -# Description: -# Initialize an unpacked nami module with the `nami initialize` command. -# Command arguments can be specified as function argumnts after the module name. -# `--log-level trace` flag is added to the command if `NAMI_DEBUG` env variable exists. -# The log level can be overriden using the `NAMI_LOG_LEVEL` env variable. -######################### -nami_initialize_one() { - local module="${1:?module not specified}" - if nami inspect $module | grep -q '"lifecycle": "unpacked"'; then - local inputs= - if [[ -f "/${module}-inputs.json" ]]; then - inputs="--inputs-file=/${module}-inputs.json" - fi - nami ${NAMI_DEBUG:+--log-level ${NAMI_LOG_LEVEL:-trace}} initialize $module $inputs "${@:2}" - fi -} - -######################## -# Helper function to initialize one or more nami modules -# Arguments: -# Module to initialize -# Returns: -# None -######################### -nami_initialize() { - local module="${1:?module not specified}" - for module in "${@}"; do - nami_initialize_one $module - done -} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh new file mode 100644 index 000000000000..ef29e361dad1 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# +# Bitnami custom library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Constants +BOLD='\033[1m' + +# Functions + +######################## +# Print the welcome page +# Globals: +# DISABLE_WELCOME_MESSAGE +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_welcome_page() { + if [[ -z "${DISABLE_WELCOME_MESSAGE:-}" ]]; then + if [[ -n "$BITNAMI_APP_NAME" ]]; then + print_image_welcome_page + fi + fi +} + +######################## +# Print the welcome page for a Bitnami Docker image +# Globals: +# BITNAMI_APP_NAME +# Arguments: +# None +# Returns: +# None +######################### +print_image_welcome_page() { + local github_url="https://github.com/bitnami/bitnami-docker-${BITNAMI_APP_NAME}" + + log "" + log "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}" + log "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}" + log "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}" + log "" +} + diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh new file mode 100644 index 000000000000..1d8c6bf24375 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libcomponent.sh @@ -0,0 +1,65 @@ +#!/bin/bash +# +# Library for managing Bitnami components + +# Constants +CACHE_ROOT="/tmp/bitnami/pkg/cache" +DOWNLOAD_URL="https://downloads.bitnami.com/files/stacksmith" + +# Functions + +######################## +# Download and unpack a Bitnami package +# Globals: +# OS_NAME +# OS_ARCH +# OS_FLAVOUR +# Arguments: +# $1 - component's name +# $2 - component's version +# Returns: +# None +######################### +component_unpack() { + local name="${1:?name is required}" + local version="${2:?version is required}" + local base_name="${name}-${version}-${OS_NAME}-${OS_ARCH}-${OS_FLAVOUR}" + local package_sha256="" + local directory="/opt/bitnami" + + # Validate arguments + shift 2 + while [ "$#" -gt 0 ]; do + case "$1" in + -c|--checksum) + shift + package_sha256="${1:?missing package checksum}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + + echo "Downloading $base_name package" + if [ -f "${CACHE_ROOT}/${base_name}.tar.gz" ]; then + echo "${CACHE_ROOT}/${base_name}.tar.gz already exists, skipping download." + cp "${CACHE_ROOT}/${base_name}.tar.gz" . + rm "${CACHE_ROOT}/${base_name}.tar.gz" + if [ -f "${CACHE_ROOT}/${base_name}.tar.gz.sha256" ]; then + echo "Using the local sha256 from ${CACHE_ROOT}/${base_name}.tar.gz.sha256" + package_sha256="$(< "${CACHE_ROOT}/${base_name}.tar.gz.sha256")" + rm "${CACHE_ROOT}/${base_name}.tar.gz.sha256" + fi + else + curl --remote-name --silent "${DOWNLOAD_URL}/${base_name}.tar.gz" + fi + if [ -n "$package_sha256" ]; then + echo "Verifying package integrity" + echo "$package_sha256 ${base_name}.tar.gz" | sha256sum --check - + fi + tar --directory "${directory}" --extract --gunzip --file "${base_name}.tar.gz" --no-same-owner --strip-components=2 "${base_name}/files/" + rm "${base_name}.tar.gz" +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh new file mode 100644 index 000000000000..b09575cbe4a6 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# +# Library for managing files + +# Functions + +######################## +# Replace a regex in a file +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - substitute regex +# $4 - use POSIX regex. Default: true +# Returns: +# None +######################### +replace_in_file() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local substitute_regex="${3:?substitute regex is required}" + local posix_regex=${4:-true} + + local result + + # We should avoid using 'sed in-place' substitutions + # 1) They are not compatible with files mounted from ConfigMap(s) + # 2) We found incompatibility issues with Debian10 and "in-place" substitutions + del=$'\001' # Use a non-printable character as a 'sed' delimiter to avoid issues + if [[ $posix_regex = true ]]; then + result="$(sed -E "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" + else + result="$(sed "s${del}${match_regex}${del}${substitute_regex}${del}g" "$filename")" + fi + echo "$result" > "$filename" +} + +######################## +# Remove a line in a file based on a regex +# Arguments: +# $1 - filename +# $2 - match regex +# $3 - use POSIX regex. Default: true +# Returns: +# None +######################### +remove_in_file() { + local filename="${1:?filename is required}" + local match_regex="${2:?match regex is required}" + local posix_regex=${3:-true} + local result + + # We should avoid using 'sed in-place' substitutions + # 1) They are not compatible with files mounted from ConfigMap(s) + # 2) We found incompatibility issues with Debian10 and "in-place" substitutions + if [[ $posix_regex = true ]]; then + result="$(sed -E "/$match_regex/d" "$filename")" + else + result="$(sed "/$match_regex/d" "$filename")" + fi + echo "$result" > "$filename" +} + +######################## +# Appends text after the last line matching a pattern +# Arguments: +# $1 - file +# $2 - match regex +# $3 - contents to add +# Returns: +# None +######################### +append_file_after_last_match() { + local file="${1:?missing file}" + local match_regex="${2:?missing pattern}" + local value="${3:?missing value}" + + # We read the file in reverse, replace the first match (0,/pattern/s) and then reverse the results again + result="$(tac "$file" | sed -E "0,/($match_regex)/s||${value}\n\1|" | tac)" + echo "$result" > "$file" +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh new file mode 100644 index 000000000000..8f37ecbd823e --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -0,0 +1,183 @@ +#!/bin/bash +# +# Library for file system actions + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Functions + +######################## +# Ensure a file/directory is owned (user and group) but the given user +# Arguments: +# $1 - filepath +# $2 - owner +# Returns: +# None +######################### +owned_by() { + local path="${1:?path is missing}" + local owner="${2:?owner is missing}" + + chown "$owner":"$owner" "$path" +} + +######################## +# Ensure a directory exists and, optionally, is owned by the given user +# Arguments: +# $1 - directory +# $2 - owner +# Returns: +# None +######################### +ensure_dir_exists() { + local dir="${1:?directory is missing}" + local owner="${2:-}" + + mkdir -p "${dir}" + if [[ -n $owner ]]; then + owned_by "$dir" "$owner" + fi +} + +######################## +# Checks whether a directory is empty or not +# arguments: +# $1 - directory +# returns: +# boolean +######################### +is_dir_empty() { + local dir="${1:?missing directory}" + + if [[ ! -e "$dir" ]] || [[ -z "$(ls -A "$dir")" ]]; then + true + else + false + fi +} + +######################## +# Checks whether a mounted directory is empty or not +# arguments: +# $1 - directory +# returns: +# boolean +######################### +is_mounted_dir_empty() { + local dir="${1:?missing directory}" + + if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then + true + else + false + fi +} + +######################## +# Checks whether a file can be written to or not +# arguments: +# $1 - file +# returns: +# boolean +######################### +is_file_writable() { + local file="${1:?missing file}" + local dir + dir="$(dirname "$file")" + + if [[ ( -f "$file" && -w "$file" ) || ( ! -f "$file" && -d "$dir" && -w "$dir" ) ]]; then + true + else + false + fi +} + +######################## +# Relativize a path +# arguments: +# $1 - path +# $2 - base +# returns: +# None +######################### +relativize() { + local -r path="${1:?missing path}" + local -r base="${2:?missing base}" + pushd "$base" >/dev/null + realpath -q --no-symlinks --relative-base="$base" "$path" | sed -e 's|^/$|.|' -e 's|^/||' + popd >/dev/null +} + +######################## +# Configure permisions and ownership recursively +# Globals: +# None +# Arguments: +# $1 - paths (as a string). +# Flags: +# -f|--file-mode - mode for directories. +# -d|--dir-mode - mode for files. +# -u|--user - user +# -g|--group - group +# Returns: +# None +######################### +configure_permissions_ownership() { + local -r paths="${1:?paths is missing}" + local dir_mode="" + local file_mode="" + local user="" + local group="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -f|--file-mode) + shift + file_mode="${1:?missing mode for files}" + ;; + -d|--dir-mode) + shift + dir_mode="${1:?missing mode for directories}" + ;; + -u|--user) + shift + user="${1:?missing user}" + ;; + -g|--group) + shift + group="${1:?missing group}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + + read -r -a filepaths <<< "$paths" + for p in "${filepaths[@]}"; do + if [[ -e "$p" ]]; then + if [[ -n $dir_mode ]]; then + find -L "$p" -type d -exec chmod "$dir_mode" {} \; + fi + if [[ -n $file_mode ]]; then + find -L "$p" -type f -exec chmod "$file_mode" {} \; + fi + if [[ -n $user ]] && [[ -n $group ]]; then + chown -LR "$user":"$group" "$p" + elif [[ -n $user ]] && [[ -z $group ]]; then + chown -LR "$user" "$p" + elif [[ -z $user ]] && [[ -n $group ]]; then + chgrp -LR "$group" "$p" + fi + else + stderr_print "$p does not exist" + fi + done +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh new file mode 100644 index 000000000000..60ec4cbfc32a --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -0,0 +1,110 @@ +#!/bin/bash +# +# Library for logging functions + +# Constants +RESET='\033[0m' +RED='\033[38;5;1m' +GREEN='\033[38;5;2m' +YELLOW='\033[38;5;3m' +MAGENTA='\033[38;5;5m' +CYAN='\033[38;5;6m' + +# Functions + +######################## +# Print to STDERR +# Arguments: +# Message to print +# Returns: +# None +######################### +stderr_print() { + # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it + local bool="${BITNAMI_QUIET:-false}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if ! [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then + printf "%b\\n" "${*}" >&2 + fi +} + +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +log() { + stderr_print "${CYAN}${MODULE:-} ${MAGENTA}$(date "+%T.%2N ")${RESET}${*}" +} +######################## +# Log an 'info' message +# Arguments: +# Message to log +# Returns: +# None +######################### +info() { + log "${GREEN}INFO ${RESET} ==> ${*}" +} +######################## +# Log message +# Arguments: +# Message to log +# Returns: +# None +######################### +warn() { + log "${YELLOW}WARN ${RESET} ==> ${*}" +} +######################## +# Log an 'error' message +# Arguments: +# Message to log +# Returns: +# None +######################### +error() { + log "${RED}ERROR${RESET} ==> ${*}" +} +######################## +# Log a 'debug' message +# Globals: +# BITNAMI_DEBUG +# Arguments: +# None +# Returns: +# None +######################### +debug() { + # 'is_boolean_yes' is defined in libvalidations.sh, but depends on this file so we cannot source it + local bool="${BITNAMI_DEBUG:-false}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then + log "${MAGENTA}DEBUG${RESET} ==> ${*}" + fi +} + +######################## +# Indent a string +# Arguments: +# $1 - string +# $2 - number of indentation characters (default: 4) +# $3 - indentation character (default: " ") +# Returns: +# None +######################### +indent() { + local string="${1:-}" + local num="${2:?missing num}" + local char="${3:-" "}" + # Build the indentation unit string + local indent_unit="" + for ((i = 0; i < num; i++)); do + indent_unit="${indent_unit}${char}" + done + echo "$string" | sed "s/^/${indent_unit}/" +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh new file mode 100644 index 000000000000..4391dacc7853 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -0,0 +1,142 @@ +#!/bin/bash +# +# Library for network functions + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Functions + +######################## +# Resolve IP address for a host/domain (i.e. DNS lookup) +# Arguments: +# $1 - Hostname to resolve +# $2 - IP address version (v4, v6), leave empty for resolving to any version +# Returns: +# IP +######################### +dns_lookup() { + local host="${1:?host is missing}" + local ip_version="${2:-}" + getent "ahosts${ip_version}" "$host" | awk '/STREAM/ {print $1 }' | head -n 1 +} + +######################### +# Wait for a hostname and return the IP +# Arguments: +# $1 - hostname +# $2 - number of retries +# $3 - seconds to wait between retries +# Returns: +# - IP address that corresponds to the hostname +######################### +wait_for_dns_lookup() { + local hostname="${1:?hostname is missing}" + local retries="${2:-5}" + local seconds="${3:-1}" + check_host() { + if [[ $(dns_lookup "$hostname") == "" ]]; then + false + else + true + fi + } + # Wait for the host to be ready + retry_while "check_host ${hostname}" "$retries" "$seconds" + dns_lookup "$hostname" +} + +######################## +# Get machine's IP +# Arguments: +# None +# Returns: +# Machine IP +######################### +get_machine_ip() { + local -a ip_addresses + local hostname + hostname="$(hostname)" + read -r -a ip_addresses <<< "$(dns_lookup "$hostname" | xargs echo)" + if [[ "${#ip_addresses[@]}" -gt 1 ]]; then + warn "Found more than one IP address associated to hostname ${hostname}: ${ip_addresses[*]}, will use ${ip_addresses[0]}" + elif [[ "${#ip_addresses[@]}" -lt 1 ]]; then + error "Could not find any IP address associated to hostname ${hostname}" + exit 1 + fi + echo "${ip_addresses[0]}" +} + +######################## +# Check if the provided argument is a resolved hostname +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_hostname_resolved() { + local -r host="${1:?missing value}" + if [[ -n "$(dns_lookup "$host")" ]]; then + true + else + false + fi +} + +######################## +# Parse URL +# Globals: +# None +# Arguments: +# $1 - uri - String +# $2 - component to obtain. Valid options (scheme, authority, userinfo, host, port, path, query or fragment) - String +# Returns: +# String +parse_uri() { + local uri="${1:?uri is missing}" + local component="${2:?component is missing}" + + # Solution based on https://tools.ietf.org/html/rfc3986#appendix-B with + # additional sub-expressions to split authority into userinfo, host and port + # Credits to Patryk Obara (see https://stackoverflow.com/a/45977232/6694969) + local -r URI_REGEX='^(([^:/?#]+):)?(//((([^@/?#]+)@)?([^:/?#]+)(:([0-9]+))?))?(/([^?#]*))?(\?([^#]*))?(#(.*))?' + # || | ||| | | | | | | | | | + # |2 scheme | ||6 userinfo 7 host | 9 port | 11 rpath | 13 query | 15 fragment + # 1 scheme: | |5 userinfo@ 8 :... 10 path 12 ?... 14 #... + # | 4 authority + # 3 //... + local index=0 + case "$component" in + scheme) + index=2 + ;; + authority) + index=4 + ;; + userinfo) + index=6 + ;; + host) + index=7 + ;; + port) + index=9 + ;; + path) + index=10 + ;; + query) + index=13 + ;; + fragment) + index=14 + ;; + *) + stderr_print "unrecognized component $component" + return 1 + ;; + esac + [[ "$uri" =~ $URI_REGEX ]] && echo "${BASH_REMATCH[${index}]}" +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh new file mode 100644 index 000000000000..cc45a19ce099 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libos.sh @@ -0,0 +1,291 @@ +#!/bin/bash +# +# Library for operating system actions + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Functions + +######################## +# Check if an user exists in the system +# Arguments: +# $1 - user +# Returns: +# Boolean +######################### +user_exists() { + local user="${1:?user is missing}" + id "$user" >/dev/null 2>&1 +} + +######################## +# Check if a group exists in the system +# Arguments: +# $1 - group +# Returns: +# Boolean +######################### +group_exists() { + local group="${1:?group is missing}" + getent group "$group" >/dev/null 2>&1 +} + +######################## +# Create a group in the system if it does not exist already +# Arguments: +# $1 - group +# Returns: +# None +######################### +ensure_group_exists() { + local group="${1:?group is missing}" + + if ! group_exists "$group"; then + groupadd "$group" >/dev/null 2>&1 + fi +} + +######################## +# Create an user in the system if it does not exist already +# Arguments: +# $1 - user +# $2 - group +# Returns: +# None +######################### +ensure_user_exists() { + local user="${1:?user is missing}" + local group="${2:-}" + + if ! user_exists "$user"; then + useradd "$user" >/dev/null 2>&1 + fi + + if [[ -n "$group" ]]; then + ensure_group_exists "$group" + usermod -a -G "$group" "$user" >/dev/null 2>&1 + fi +} + +######################## +# Check if the script is currently running as root +# Arguments: +# $1 - user +# $2 - group +# Returns: +# Boolean +######################### +am_i_root() { + if [[ "$(id -u)" = "0" ]]; then + true + else + false + fi +} + +######################## +# Get total memory available +# Arguments: +# None +# Returns: +# Memory in bytes +######################### +get_total_memory() { + echo $(($(grep MemTotal /proc/meminfo | awk '{print $2}') / 1024)) +} + +######################## +# Get machine size depending on specified memory +# Globals: +# None +# Arguments: +# None +# Flags: +# --memory - memory size (optional) +# Returns: +# Detected instance size +######################### +get_machine_size() { + local memory="" + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + --memory) + shift + memory="${1:?missing memory}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + if [[ -z "$memory" ]]; then + debug "Memory was not specified, detecting available memory automatically" + memory="$(get_total_memory)" + fi + sanitized_memory=$(convert_to_mb "$memory") + if [[ "$sanitized_memory" -gt 26000 ]]; then + echo 2xlarge + elif [[ "$sanitized_memory" -gt 13000 ]]; then + echo xlarge + elif [[ "$sanitized_memory" -gt 6000 ]]; then + echo large + elif [[ "$sanitized_memory" -gt 3000 ]]; then + echo medium + elif [[ "$sanitized_memory" -gt 1500 ]]; then + echo small + else + echo micro + fi +} + +######################## +# Get machine size depending on specified memory +# Globals: +# None +# Arguments: +# $1 - memory size (optional) +# Returns: +# Detected instance size +######################### +get_supported_machine_sizes() { + echo micro small medium large xlarge 2xlarge +} + +######################## +# Convert memory size from string to amount of megabytes (i.e. 2G -> 2048) +# Globals: +# None +# Arguments: +# $1 - memory size +# Returns: +# Result of the conversion +######################### +convert_to_mb() { + local amount="${1:-}" + if [[ $amount =~ ^([0-9]+)(m|M|g|G) ]]; then + size="${BASH_REMATCH[1]}" + unit="${BASH_REMATCH[2]}" + if [[ "$unit" = "g" || "$unit" = "G" ]]; then + amount="$((size * 1024))" + else + amount="$size" + fi + fi + echo "$amount" +} + + +######################### +# Redirects output to /dev/null if debug mode is disabled +# Globals: +# BITNAMI_DEBUG +# Arguments: +# $@ - Command to execute +# Returns: +# None +######################### +debug_execute() { + if ${BITNAMI_DEBUG:-false}; then + "$@" + else + "$@" >/dev/null 2>&1 + fi +} + +######################## +# Retries a command a given number of times +# Arguments: +# $1 - cmd (as a string) +# $2 - max retries. Default: 12 +# $3 - sleep between retries (in seconds). Default: 5 +# Returns: +# Boolean +######################### +retry_while() { + local cmd="${1:?cmd is missing}" + local retries="${2:-12}" + local sleep_time="${3:-5}" + local return_value=1 + + read -r -a command <<< "$cmd" + for ((i = 1 ; i <= retries ; i+=1 )); do + "${command[@]}" && return_value=0 && break + sleep "$sleep_time" + done + return $return_value +} + +######################## +# Generate a random string +# Arguments: +# -t|--type - String type (ascii, alphanumeric, numeric), defaults to ascii +# -c|--count - Number of characters, defaults to 32 +# Arguments: +# None +# Returns: +# None +# Returns: +# String +######################### +generate_random_string() { + local type="ascii" + local count="32" + local filter + local result + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + -t|--type) + shift + type="$1" + ;; + -c|--count) + shift + count="$1" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + # Validate type + case "$type" in + ascii) + filter="[:print:]" + ;; + alphanumeric) + filter="a-zA-Z0-9" + ;; + numeric) + filter="0-9" + ;; + *) + echo "Invalid type ${type}" >&2 + return 1 + esac + # Obtain count + 10 lines from /dev/urandom to ensure that the resulting string has the expected size + # Note there is a very small chance of strings starting with EOL character + # Therefore, the higher amount of lines read, this will happen less frequently + result="$(head -n "$((count + 10))" /dev/urandom | tr -dc "$filter" | head -c "$count")" + echo "$result" +} + +######################## +# Create md5 hash from a string +# Arguments: +# $1 - string +# Returns: +# md5 hash - string +######################### +generate_md5_hash() { + local -r str="${1:?missing input string}" + echo -n "$str" | md5sum | awk '{print $1}' +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh new file mode 100644 index 000000000000..452c1f4b2831 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -0,0 +1,122 @@ +#!/bin/bash +# +# Bitnami persistence library +# Used for bringing persistence capabilities to applications that don't have clear separation of data and logic + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libversion.sh + +# Functions + +######################## +# Persist an application directory +# Globals: +# BITNAMI_ROOT_DIR +# BITNAMI_VOLUME_DIR +# Arguments: +# $1 - App folder name +# $2 - List of app files to persist +# Returns: +# true if all steps succeeded, false otherwise +######################### +persist_app() { + local -r app="${1:?missing app}" + local -a files_to_restore + read -r -a files_to_persist <<< "$2" + local -r install_dir="${BITNAMI_ROOT_DIR}/${app}" + local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" + # Persist the individual files + if [[ "${#files_to_persist[@]}" -lt 0 ]]; then + warn "No files are configured to be persisted" + return + fi + pushd "$install_dir" >/dev/null + local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder + local -r tmp_file="/tmp/perms.acl" + for file_to_persist in "${files_to_persist[@]}"; do + if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then + error "Cannot persist '${file_to_persist}' because it does not exist" + return 1 + fi + file_to_persist_relative="$(relativize "$file_to_persist" "$install_dir")" + file_to_persist_destination="${persist_dir}/${file_to_persist_relative}" + file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" + # Get original permissions for existing files, which will be applied later + # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume + getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" + # Copy directories to the volume + ensure_dir_exists "$file_to_persist_destination_folder" + cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" + # Restore permissions + pushd "$persist_dir" >/dev/null + if am_i_root; then + setfacl --restore="$tmp_file" + else + # When running as non-root, don't change ownership + setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + fi + popd >/dev/null + done + popd >/dev/null + rm -f "$tmp_file" + # Install the persisted files into the installation directory, via symlinks + restore_persisted_app "$@" +} + +######################## +# Restore a persisted application directory +# Globals: +# BITNAMI_ROOT_DIR +# BITNAMI_VOLUME_DIR +# FORCE_MAJOR_UPGRADE +# Arguments: +# $1 - App folder name +# $2 - List of app files to restore +# Returns: +# true if all steps succeeded, false otherwise +######################### +restore_persisted_app() { + local -r app="${1:?missing app}" + local -a files_to_restore + read -r -a files_to_restore <<< "$2" + local -r install_dir="${BITNAMI_ROOT_DIR}/${app}" + local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" + # Restore the individual persisted files + if [[ "${#files_to_restore[@]}" -lt 0 ]]; then + warn "No persisted files are configured to be restored" + return + fi + local file_to_restore_relative file_to_restore_origin file_to_restore_destination + for file_to_restore in "${files_to_restore[@]}"; do + file_to_restore_relative="$(relativize "$file_to_restore" "$install_dir")" + # We use 'realpath --no-symlinks' to ensure that the case of '.' is covered and the directory is removed + file_to_restore_origin="$(realpath --no-symlinks "${install_dir}/${file_to_restore_relative}")" + file_to_restore_destination="$(realpath --no-symlinks "${persist_dir}/${file_to_restore_relative}")" + rm -rf "$file_to_restore_origin" + ln -sfn "$file_to_restore_destination" "$file_to_restore_origin" + done +} + +######################## +# Check if an application directory was already persisted +# Globals: +# BITNAMI_VOLUME_DIR +# Arguments: +# $1 - App folder name +# Returns: +# true if all steps succeeded, false otherwise +######################### +is_app_initialized() { + local -r app="${1:?missing app}" + local -r persist_dir="${BITNAMI_VOLUME_DIR}/${app}" + if ! is_mounted_dir_empty "$persist_dir"; then + true + else + false + fi +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh new file mode 100644 index 000000000000..55e1dfc4ab28 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -0,0 +1,225 @@ +#!/bin/bash +# +# Library for managing services + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/liblog.sh + +# Functions + +######################## +# Read the provided pid file and returns a PID +# Arguments: +# $1 - Pid file +# Returns: +# PID +######################### +get_pid_from_file() { + local pid_file="${1:?pid file is missing}" + + if [[ -f "$pid_file" ]]; then + if [[ -n "$(< "$pid_file")" ]] && [[ "$(< "$pid_file")" -gt 0 ]]; then + echo "$(< "$pid_file")" + fi + fi +} + +######################## +# Check if a provided PID corresponds to a running service +# Arguments: +# $1 - PID +# Returns: +# Boolean +######################### +is_service_running() { + local pid="${1:?pid is missing}" + + kill -0 "$pid" 2>/dev/null +} + +######################## +# Stop a service by sending a termination signal to its pid +# Arguments: +# $1 - Pid file +# $2 - Signal number (optional) +# Returns: +# None +######################### +stop_service_using_pid() { + local pid_file="${1:?pid file is missing}" + local signal="${2:-}" + local pid + + pid="$(get_pid_from_file "$pid_file")" + [[ -z "$pid" ]] || ! is_service_running "$pid" && return + + if [[ -n "$signal" ]]; then + kill "-${signal}" "$pid" + else + kill "$pid" + fi + + local counter=10 + while [[ "$counter" -ne 0 ]] && is_service_running "$pid"; do + sleep 1 + counter=$((counter - 1)) + done +} + +######################## +# Start cron daemon +# Arguments: +# None +# Returns: +# true if started correctly, false otherwise +######################### +cron_start() { + if [[ -x "/usr/sbin/cron" ]]; then + /usr/sbin/cron + elif [[ -x "/usr/sbin/crond" ]]; then + /usr/sbin/crond + else + false + fi +} + +######################## +# Generate a cron configuration file for a given service +# Arguments: +# $1 - Service name +# $2 - Command +# Flags: +# --run-as - User to run as (default: root) +# --schedule - Cron schedule configuration (default: * * * * *) +# Returns: +# None +######################### +generate_cron_conf() { + local service_name="${1:?service name is missing}" + local cmd="${2:?command is missing}" + local run_as="root" + local schedule="* * * * *" + + # Parse optional CLI flags + shift 2 + while [[ "$#" -gt 0 ]]; do + case "$1" in + --run-as) + shift + run_as="$1" + ;; + --schedule) + shift + schedule="$1" + ;; + *) + echo "Invalid command line flag ${1}" >&2 + return 1 + ;; + esac + shift + done + + mkdir -p /etc/cron.d + echo "${schedule} ${run_as} ${cmd}" > /etc/cron.d/"$service_name" +} + +######################## +# Generate a monit configuration file for a given service +# Arguments: +# $1 - Service name +# $2 - Pid file +# $3 - Start command +# $4 - Stop command +# Flags: +# --disabled - Whether to disable the monit configuration +# Returns: +# None +######################### +generate_monit_conf() { + local service_name="${1:?service name is missing}" + local pid_file="${2:?pid file is missing}" + local start_command="${3:?start command is missing}" + local stop_command="${4:?stop command is missing}" + local monit_conf_dir="/etc/monit/conf.d" + local disabled="no" + + # Parse optional CLI flags + shift 4 + while [[ "$#" -gt 0 ]]; do + case "$1" in + --disabled) + shift + disabled="$1" + ;; + *) + echo "Invalid command line flag ${1}" >&2 + return 1 + ;; + esac + shift + done + + is_boolean_yes "$disabled" && conf_suffix=".disabled" + mkdir -p "$monit_conf_dir" + cat >"${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" <&2 + return 1 + ;; + esac + shift + done + + mkdir -p "$logrotate_conf_dir" + cat <"${logrotate_conf_dir}/${service_name}" +${log_path} { + ${period} + rotate ${rotations} + dateext + compress + copytruncate + missingok +$(indent "$extra" 2) +} +EOF +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh new file mode 100644 index 000000000000..8d827924afe4 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -0,0 +1,248 @@ +#!/bin/bash +# +# Validation functions library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Functions + +######################## +# Check if the provided argument is an integer +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_int() { + local -r int="${1:?missing value}" + if [[ "$int" =~ ^-?[0-9]+ ]]; then + true + else + false + fi +} + +######################## +# Check if the provided argument is a positive integer +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_positive_int() { + local -r int="${1:?missing value}" + if is_int "$int" && (( "${int}" >= 0 )); then + true + else + false + fi +} + +######################## +# Check if the provided argument is a boolean or is the string 'yes/true' +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_boolean_yes() { + local -r bool="${1:-}" + # comparison is performed without regard to the case of alphabetic characters + shopt -s nocasematch + if [[ "$bool" = 1 || "$bool" =~ ^(yes|true)$ ]]; then + true + else + false + fi +} + +######################## +# Check if the provided argument is a boolean yes/no value +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_yes_no_value() { + local -r bool="${1:-}" + if [[ "$bool" =~ ^(yes|no)$ ]]; then + true + else + false + fi +} + +######################## +# Check if the provided argument is a boolean true/false value +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_true_false_value() { + local -r bool="${1:-}" + if [[ "$bool" =~ ^(true|false)$ ]]; then + true + else + false + fi +} + +######################## +# Check if the provided argument is an empty string or not defined +# Arguments: +# $1 - Value to check +# Returns: +# Boolean +######################### +is_empty_value() { + local -r val="${1:-}" + if [[ -z "$val" ]]; then + true + else + false + fi +} + +######################## +# Validate if the provided argument is a valid port +# Arguments: +# $1 - Port to validate +# Returns: +# Boolean and error message +######################### +validate_port() { + local value + local unprivileged=0 + + # Parse flags + while [[ "$#" -gt 0 ]]; do + case "$1" in + -unprivileged) + unprivileged=1 + ;; + --) + shift + break + ;; + -*) + stderr_print "unrecognized flag $1" + return 1 + ;; + *) + break + ;; + esac + shift + done + + if [[ "$#" -gt 1 ]]; then + echo "too many arguments provided" + return 2 + elif [[ "$#" -eq 0 ]]; then + stderr_print "missing port argument" + return 1 + else + value=$1 + fi + + if [[ -z "$value" ]]; then + echo "the value is empty" + return 1 + else + if ! is_int "$value"; then + echo "value is not an integer" + return 2 + elif [[ "$value" -lt 0 ]]; then + echo "negative value provided" + return 2 + elif [[ "$value" -gt 65535 ]]; then + echo "requested port is greater than 65535" + return 2 + elif [[ "$unprivileged" = 1 && "$value" -lt 1024 ]]; then + echo "privileged port requested" + return 3 + fi + fi +} + +######################## +# Validate if the provided argument is a valid IPv4 address +# Arguments: +# $1 - IP to validate +# Returns: +# Boolean +######################### +validate_ipv4() { + local ip="${1:?ip is missing}" + local stat=1 + + if [[ $ip =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + read -r -a ip_array <<< "$(tr '.' ' ' <<< "$ip")" + [[ ${ip_array[0]} -le 255 && ${ip_array[1]} -le 255 \ + && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]] + stat=$? + fi + return $stat +} + +######################## +# Validate a string format +# Arguments: +# $1 - String to validate +# Returns: +# Boolean +######################### +validate_string() { + local string + local min_length=-1 + local max_length=-1 + + # Parse flags + while [ "$#" -gt 0 ]; do + case "$1" in + -min-length) + shift + min_length=${1:-} + ;; + -max-length) + shift + max_length=${1:-} + ;; + --) + shift + break + ;; + -*) + stderr_print "unrecognized flag $1" + return 1 + ;; + *) + break + ;; + esac + shift + done + + if [ "$#" -gt 1 ]; then + stderr_print "too many arguments provided" + return 2 + elif [ "$#" -eq 0 ]; then + stderr_print "missing string" + return 1 + else + string=$1 + fi + + if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then + echo "string length is less than $min_length" + return 1 + fi + if [[ "$max_length" -ge 0 ]] && [[ "${#string}" -gt "$max_length" ]]; then + echo "string length is great than $max_length" + return 1 + fi +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh new file mode 100644 index 000000000000..66d4f457bdd2 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -0,0 +1,49 @@ +#!/bin/bash +# +# Library for managing versions strings + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh + +# Functions +######################## +# Gets semantic version +# Arguments: +# $1 - version: string to extract major.minor.patch +# $2 - section: 1 to extract major, 2 to extract minor, 3 to extract patch +# Returns: +# array with the major, minor and release +######################### +get_sematic_version () { + local version="${1:?version is required}" + local section="${2:?section is required}" + local -a version_sections + + #Regex to parse versions: x.y.z + local -r regex='([0-9]+)(\.([0-9]+)(\.([0-9]+))?)?' + + if [[ "$version" =~ $regex ]]; then + local i=1 + local j=1 + local n=${#BASH_REMATCH[*]} + + while [[ $i -lt $n ]]; do + if [[ -n "${BASH_REMATCH[$i]}" ]] && [[ "${BASH_REMATCH[$i]:0:1}" != '.' ]]; then + version_sections[$j]=${BASH_REMATCH[$i]} + ((j++)) + fi + ((i++)) + done + + local number_regex='^[0-9]+$' + if [[ "$section" =~ $number_regex ]] && (( $section > 0 )) && (( $section <= 3 )); then + echo "${version_sections[$section]}" + return + else + stderr_print "Section allowed values are: 1, 2, and 3" + return 1 + fi + fi +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh new file mode 100644 index 000000000000..25bff4a05105 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/prebuildfs/opt/bitnami/scripts/libwebserver.sh @@ -0,0 +1,421 @@ +#!/bin/bash +# +# Bitnami web server handler library + +# shellcheck disable=SC1090,SC1091 + +# Load generic libraries +. /opt/bitnami/scripts/liblog.sh + +######################## +# Execute a command (or list of commands) with the web server environment and library loaded +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_execute() { + local -r web_server="${1:?missing web server}" + shift + # Run program in sub-shell to avoid web server environment getting loaded when not necessary + ( + . "/opt/bitnami/scripts/lib${web_server}.sh" + . "/opt/bitnami/scripts/${web_server}-env.sh" + "$@" + ) +} + +######################## +# Prints the list of enabled web servers +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +web_server_list() { + local -r -a supported_web_servers=(apache nginx) + local -a existing_web_servers=() + for web_server in "${supported_web_servers[@]}"; do + [[ -f "/opt/bitnami/scripts/${web_server}-env.sh" ]] && existing_web_servers+=("$web_server") + done + echo "${existing_web_servers[@]:-}" +} + +######################## +# Prints the currently-enabled web server type (only one, in order of preference) +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +web_server_type() { + local -a web_servers + read -r -a web_servers <<< "$(web_server_list)" + echo "${web_servers[0]:-}" +} + +######################## +# Validate that a supported web server is configured +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +web_server_validate() { + local error_code=0 + local supported_web_servers=("apache" "nginx") + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + + if [[ -z "$(web_server_type)" || ! " ${supported_web_servers[*]} " == *" $(web_server_type) "* ]]; then + print_validation_error "Could not detect any supported web servers. It must be one of: ${supported_web_servers[*]}" + elif ! web_server_execute "$(web_server_type)" type -t "is_$(web_server_type)_running" >/dev/null; then + print_validation_error "Could not load the $(web_server_type) web server library from /opt/bitnami/scripts. Check that it exists and is readable." + fi + + return "$error_code" +} + +######################## +# Check whether the web server is running +# Globals: +# * +# Arguments: +# None +# Returns: +# true if the web server is running, false otherwise +######################### +is_web_server_running() { + "is_$(web_server_type)_running" +} + +######################## +# Start web server +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_start() { + info "Starting $(web_server_type) in background" + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/start.sh" +} + +######################## +# Stop web server +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_stop() { + info "Stopping $(web_server_type)" + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/stop.sh" +} + +######################## +# Restart web server +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_restart() { + info "Restarting $(web_server_type)" + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/restart.sh" +} + +######################## +# Reload web server +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_reload() { + "${BITNAMI_ROOT_DIR}/scripts/$(web_server_type)/reload.sh" +} + +######################## +# Ensure a web server application configuration exists (i.e. Apache virtual host format or NGINX server block) +# It serves as a wrapper for the specific web server function +# Globals: +# * +# Arguments: +# $1 - App name +# Flags: +# --hosts - Hosts to enable +# --type - Application type, which has an effect on which configuration template to use +# --allow-remote-connections - Whether to allow remote connections or to require local connections +# --disabled - Whether to render the file with a .disabled prefix +# --enable-https - Enable app configuration on HTTPS port +# --http-port - HTTP port number +# --https-port - HTTPS port number +# --document-root - Path to document root directory +# Apache-specific flags: +# --apache-additional-configuration - Additional vhost configuration (no default) +# --apache-before-vhost-configuration - Configuration to add before the directive (no default) +# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --apache-extra-directory-configuration - Extra configuration for the document root directory +# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# NGINX-specific flags: +# --nginx-additional-configuration - Additional server block configuration (no default) +# Returns: +# true if the configuration was enabled, false otherwise +######################## +ensure_web_server_app_configuration_exists() { + local app="${1:?missing app}" + shift + local -a apache_args nginx_args web_servers args_var + apache_args=("$app") + nginx_args=("$app") + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --hosts \ + | --type \ + | --allow-remote-connections \ + | --disabled \ + | --enable-https \ + | --http-port \ + | --https-port \ + | --document-root \ + ) + apache_args+=("$1" "${2:?missing value}") + nginx_args+=("$1" "${2:?missing value}") + shift + ;; + + # Specific Apache flags + --apache-additional-configuration \ + | --apache-before-vhost-configuration \ + | --apache-allow-override \ + | --apache-extra-directory-configuration \ + | --apache-move-htaccess \ + ) + apache_args+=("${1//apache-/}" "${2:?missing value}") + shift + ;; + + # Specific NGINX flags + --nginx-additional-configuration) + nginx_args+=("${1//nginx-/}" "${2:?missing value}") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + args_var="${web_server}_args[@]" + web_server_execute "$web_server" "ensure_${web_server}_app_configuration_exists" "${!args_var}" + done +} + +######################## +# Ensure a web server application configuration does not exist anymore (i.e. Apache virtual host format or NGINX server block) +# It serves as a wrapper for the specific web server function +# Globals: +# * +# Arguments: +# $1 - App name +# Returns: +# true if the configuration was disabled, false otherwise +######################## +ensure_web_server_app_configuration_not_exists() { + local app="${1:?missing app}" + local -a web_servers + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + web_server_execute "$web_server" "ensure_${web_server}_app_configuration_not_exists" "$app" + done +} + +######################## +# Ensure the web server loads the configuration for an application in a URL prefix +# It serves as a wrapper for the specific web server function +# Globals: +# * +# Arguments: +# $1 - App name +# Flags: +# --allow-remote-connections - Whether to allow remote connections or to require local connections +# --document-root - Path to document root directory +# --prefix - URL prefix from where it will be accessible (i.e. /myapp) +# --type - Application type, which has an effect on what configuration template will be used +# Apache-specific flags: +# --apache-additional-configuration - Additional vhost configuration (no default) +# --apache-allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --apache-extra-directory-configuration - Extra configuration for the document root directory +# --apache-move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# NGINX-specific flags: +# --nginx-additional-configuration - Additional server block configuration (no default) +# Returns: +# true if the configuration was enabled, false otherwise +######################## +ensure_web_server_prefix_configuration_exists() { + local app="${1:?missing app}" + shift + local -a apache_args nginx_args web_servers args_var + apache_args=("$app") + nginx_args=("$app") + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --allow-remote-connections \ + | --document-root \ + | --prefix \ + | --type \ + ) + apache_args+=("$1" "${2:?missing value}") + nginx_args+=("$1" "${2:?missing value}") + shift + ;; + + # Specific Apache flags + --apache-additional-configuration \ + | --apache-allow-override \ + | --apache-extra-directory-configuration \ + | --apache-move-htaccess \ + ) + apache_args+=("${1//apache-/}" "$2") + shift + ;; + + # Specific NGINX flags + --nginx-additional-configuration) + nginx_args+=("${1//nginx-/}" "$2") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + args_var="${web_server}_args[@]" + web_server_execute "$web_server" "ensure_${web_server}_prefix_configuration_exists" "${!args_var}" + done +} + +######################## +# Ensure a web server application configuration is updated with the runtime configuration (i.e. ports) +# It serves as a wrapper for the specific web server function +# Globals: +# * +# Arguments: +# $1 - App name +# Flags: +# --hosts - Hosts to enable +# --enable-https - Update HTTPS app configuration +# --http-port - HTTP port number +# --https-port - HTTPS port number +# Returns: +# true if the configuration was updated, false otherwise +######################## +web_server_update_app_configuration() { + local app="${1:?missing app}" + shift + local -a args web_servers + args=("$app") + # Validate arguments + while [[ "$#" -gt 0 ]]; do + case "$1" in + # Common flags + --hosts \ + | --enable-https \ + | --http-port \ + | --https-port \ + ) + args+=("$1" "${2:?missing value}") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + read -r -a web_servers <<< "$(web_server_list)" + for web_server in "${web_servers[@]}"; do + web_server_execute "$web_server" "${web_server}_update_app_configuration" "${args[@]}" + done +} + +######################## +# Enable loading page, which shows users that the initialization process is not yet completed +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_enable_loading_page() { + ensure_web_server_app_configuration_exists "__loading" --hosts "_default_" \ + --apache-additional-configuration " +# Show a HTTP 503 Service Unavailable page by default +RedirectMatch 503 ^/$ +# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes +ErrorDocument 404 /index.html +ErrorDocument 503 /index.html" \ + --nginx-additional-configuration " +# Show a HTTP 503 Service Unavailable page by default +location / { + return 503; +} +# Show index.html if server is answering with 404 Not Found or 503 Service Unavailable status codes +error_page 404 @installing; +error_page 503 @installing; +location @installing { + rewrite ^(.*)$ /index.html break; +}" + web_server_reload +} + +######################## +# Enable loading page, which shows users that the initialization process is not yet completed +# Globals: +# * +# Arguments: +# None +# Returns: +# None +######################### +web_server_disable_install_page() { + ensure_web_server_app_configuration_not_exists "__loading" + web_server_reload +} diff --git a/bitnami/owncloud/10/debian-10/prebuildfs/usr/sbin/bitnami-pkg b/bitnami/owncloud/10/debian-10/prebuildfs/usr/sbin/bitnami-pkg deleted file mode 100755 index 775126332da4..000000000000 --- a/bitnami/owncloud/10/debian-10/prebuildfs/usr/sbin/bitnami-pkg +++ /dev/null @@ -1,222 +0,0 @@ -#!/bin/bash -e -. /opt/bitnami/base/functions - -print_usage() { - log "Usage: bitnami-pkg - [OPTIONS] -- [ARGS]" - log "" - log "Download and install Bitnami packages" - log "" - log "Commands:" - log " install Download and install a package." - log " unpack Download and unpack a package." - log "" - log "Options:" - log " -b, --bucket Package release bucket (default: stacksmith)." - log " -c, --checksum SHA256 verification checksum." - log " -h, --help Show this help message and exit." - log "" - log "If the package is already available in the /tmp/bitnami/pkg/cache/" - log "directory, the download will be skipped. If there is a corresponding" - log "file of the same name post-fixed with .sha256 in the directory," - log "that sha will be used instead of the --checksum option." - log "" - log "Examples:" - log " - Unpack package" - log " \$ bitnami-pkg unpack nginx-1.9.10-0" - log "" - log " - Verify and Install package" - log " \$ bitnami-pkg install nginx-1.9.10-0 --checksum 15565d06b18c2e3710fc08e579ddb3d0e39aa663264a0f7404f0743cb4cdb58d" - log "" - log " - Install package with arguments" - log " \$ bitnami-pkg install mariadb-10.1.11-0 -- --password bitnami" - log "" - log " - Install package from testing" - log " \$ bitnami-pkg install mariadb-10.1.11-0 --bucket testing" - log "" -} - -identify_distro() { - distro="${IMAGE_OS:-unknown}" - if [ "${distro}" == "unknown" -a -f /etc/os-release ]; then - distro="$(grep "^ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2)-$(grep "^VERSION_ID=" /etc/os-release | cut -d'=' -f2 | cut -d'"' -f2 | cut -d'.' -f1)" - fi - echo "$distro" -} - -identify_arch() { - local arch=$(uname -m) - - case "${arch}" in - ppc64le) ;; - # no-op - x86_64) - case $(identify_distro) in - debian-*) - arch=amd64 - ;; - ubuntu-*) - arch=amd64 - ;; - ol-*) - arch=x86_64 - ;; - centos-*) - arch=x86_64 - ;; - rhel-*) - arch=x86_64 - ;; - photon-*) - arch=x86_64 - ;; - esac - ;; - *) - arch="unknown" - ;; - esac - echo $arch -} - -# break up command line for easy parsing and check legal options -ARGS=$(getopt -o b:c:h -l "bucket:,checksum:,help" -n "bitnami-pkg" -- "$@") -if [ $? -ne 0 ]; then - exit 1 -fi - -eval set -- "$ARGS" -while true; do - case "$1" in - -b | --bucket) - shift - if [ -n "$1" ]; then - RELEASE_BUCKET=$1 - shift - fi - ;; - -c | --checksum) - shift - if [ -n "$1" ]; then - PACKAGE_SHA256=$1 - shift - fi - ;; - -h | --help) - print_usage - exit 0 - ;; - --) - shift - break - ;; - esac -done - -# weed out unrecognized commands -case "$1" in -install | unpack) ;; -*) - error "Unrecognized command: $1" - print_usage - exit 1 - ;; -esac - -# install/unpack command need to be supplied a package name -if [ $# -lt 2 ]; then - print_usage - exit 1 -fi - -INSTALL_ROOT=/tmp/bitnami/pkg/install -CACHE_ROOT=/tmp/bitnami/pkg/cache - -PACKAGE="$2-linux-$(identify_arch)-$(identify_distro)" -PACKAGE_ARGS=${@:3} -PACKAGE_NAME=$(echo $PACKAGE | sed 's/-[0-9].*//') -RELEASE_BUCKET=${RELEASE_BUCKET:-stacksmith} - -mkdir -p $INSTALL_ROOT -cd $INSTALL_ROOT - -info "Downloading $PACKAGE package" -if [ -f $CACHE_ROOT/$PACKAGE.tar.gz ]; then - info "$CACHE_ROOT/$PACKAGE.tar.gz already exists, skipping download." - cp $CACHE_ROOT/$PACKAGE.tar.gz . - if [ -f $CACHE_ROOT/$PACKAGE.tar.gz.sha256 ]; then - info "Using the local sha256 from $CACHE_ROOT/$PACKAGE.tar.gz.sha256" - PACKAGE_SHA256=$(cat $CACHE_ROOT/$PACKAGE.tar.gz.sha256) - fi -else - # display cURL progress bar when a tty is attached - if tty -s; then - CURL_ARGS="-#" - else - CURL_ARGS="-sS" - fi - if ! curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/$PACKAGE.tar.gz"; then - warn "Package name '$PACKAGE' does not exist, will try '${PACKAGE%-$(identify_distro)}'..." - if curl $CURL_ARGS -LOf "https://downloads.bitnami.com/files/$RELEASE_BUCKET/${PACKAGE%-$(identify_distro)}.tar.gz"; then - PACKAGE="${PACKAGE%-$(identify_distro)}" - else - error "Could not find the requested package..." - exit 1 - fi - fi -fi - -if ! tar tzf $PACKAGE.tar.gz >/dev/null 2>&1; then - error "Invalid or corrupt '$PACKAGE' package." - exit 1 -fi - -if [ "$PACKAGE_SHA256" ]; then - info "Verifying package integrity" - echo "$PACKAGE_SHA256 $PACKAGE.tar.gz" | sha256sum -c - -fi - -# If the tarball has too many files, it can trigger a bug -# in overlayfs when using tar. Install bsdtar in the container image -# to workaround it. As the overhead is too big (~40 MB), it is not added by -# default. Source: https://github.com/coreos/bugs/issues/1095 -if which bsdtar >/dev/null 2>&1; then - bsdtar -xf $PACKAGE.tar.gz -else - tar xzf $PACKAGE.tar.gz -fi - -case "$1" in -install) info "Installing $PACKAGE" ;; -unpack) info "Unpacking $PACKAGE" ;; -esac - -nami $1 $PACKAGE $PACKAGE_ARGS - -if [[ $PACKAGE =~ git-.* ]]; then - # Due to a nami unpack issue, git binaries are copied instead of using hard symlinks. - # This workaround overwrites these binaries with the original ones, preserving links - # and saving ~500 MB - info "Patching ${PACKAGE}" - cp -a --force "${INSTALL_ROOT}/${PACKAGE}/files/git/." "/opt/bitnami/git" -fi - -rm -rf $INSTALL_ROOT - -if [ "$BITNAMI_PKG_EXTRA_DIRS" ]; then - info "Creating extra directories" - for i in ${BITNAMI_PKG_EXTRA_DIRS}; do - mkdir -p $i - done -fi - -if [ "$BITNAMI_PKG_CHMOD" ]; then - DIRS="/.nami /bitnami $BITNAMI_PKG_EXTRA_DIRS" - if ! [[ $PACKAGE_NAME =~ .*-client ]]; then - mkdir -p /bitnami/$PACKAGE_NAME - fi - # We need to be in $HOME in order to nami inspect works - cd $HOME - DIRS+=" $(nami inspect $PACKAGE_NAME | grep -e '"installdir"' | cut -f4 -d\")" - info "Fixing permissions: chmod $BITNAMI_PKG_CHMOD $DIRS" - chmod $BITNAMI_PKG_CHMOD $DIRS -fi diff --git a/bitnami/owncloud/10/debian-10/rootfs/apache-init.sh b/bitnami/owncloud/10/debian-10/rootfs/apache-init.sh deleted file mode 100644 index b22b41cc9e72..000000000000 --- a/bitnami/owncloud/10/debian-10/rootfs/apache-init.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Check whether Apache ports must be configured -if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" || -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then - export APACHE_ENABLE_CUSTOM_PORTS="yes" -fi - -# Copy vhosts file -if [[ "$(ls -A /vhosts 2>/dev/null)" ]]; then - info "Found vhost definitions in /vhosts. Copying them to /opt/bitnami/apache/conf/vhosts" - cp -r /vhosts/* /opt/bitnami/apache/conf/vhosts -fi - -# Mount certificate files -if [[ -d "/opt/bitnami/apache/certs" ]]; then - warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" - warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..." - rm -rf /opt/bitnami/apache/conf/bitnami/certs - ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs -elif [ "$(ls -A /certs 2>/dev/null)" ]; then - info "Mounting certificates files from /certs..." - rm -rf /opt/bitnami/apache/conf/bitnami/certs - ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs -fi diff --git a/bitnami/owncloud/10/debian-10/rootfs/apache-inputs.json b/bitnami/owncloud/10/debian-10/rootfs/apache-inputs.json deleted file mode 100644 index 77ab9593775e..000000000000 --- a/bitnami/owncloud/10/debian-10/rootfs/apache-inputs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "enableCustomPorts": "{{$global.env.APACHE_ENABLE_CUSTOM_PORTS}}", - "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", - "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}" -} \ No newline at end of file diff --git a/bitnami/owncloud/10/debian-10/rootfs/app-entrypoint.sh b/bitnami/owncloud/10/debian-10/rootfs/app-entrypoint.sh deleted file mode 100755 index ecde0153c055..000000000000 --- a/bitnami/owncloud/10/debian-10/rootfs/app-entrypoint.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -e - -. /opt/bitnami/base/functions -. /opt/bitnami/base/helpers - -print_welcome_page - -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then - . /apache-init.sh - nami_initialize php apache mysql-client owncloud - info "Starting gosu... " - . /post-init.sh -fi - -exec tini -- "$@" diff --git a/bitnami/owncloud/10/debian-10/rootfs/mysql-client-inputs.json b/bitnami/owncloud/10/debian-10/rootfs/mysql-client-inputs.json deleted file mode 100644 index eee1b745ba79..000000000000 --- a/bitnami/owncloud/10/debian-10/rootfs/mysql-client-inputs.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "allowEmptyPassword": "{{$global.env.ALLOW_EMPTY_PASSWORD}}", - "createDatabaseName": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_NAME}}", - "createDatabasePassword": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PASSWORD}}", - "createDatabasePrivileges": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_PRIVILEGES}}", - "createDatabaseUser": "{{$global.env.MYSQL_CLIENT_CREATE_DATABASE_USER}}", - "host": "{{$global.env.MARIADB_HOST}}", - "port": "{{$global.env.MARIADB_PORT_NUMBER}}", - "rootPassword": "{{$global.env.MARIADB_ROOT_PASSWORD}}", - "rootUser": "{{$global.env.MARIADB_ROOT_USER}}", - "sslCAFile": "{{$global.env.MYSQL_CLIENT_SSL_CA_FILE}}", - "sslEnable": "{{$global.env.MYSQL_CLIENT_ENABLE_SSL}}" -} \ No newline at end of file diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt new file mode 100644 index 000000000000..466bbeab9ff4 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.crt @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE----- +MIICqDCCAZACCQCz8T3726LYsjANBgkqhkiG9w0BAQUFADAWMRQwEgYDVQQDDAtl +eGFtcGxlLmNvbTAeFw0xMjExMTQxMTE4MjdaFw0yMjExMTIxMTE4MjdaMBYxFDAS +BgNVBAMMC2V4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2SixwPL5c8glneI +Rz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC+Cup0k+Kd4NM +eZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICzdtRa3MXqTmEF +foyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg7Gj95zCH73BQ +ANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0uOSTNRcXY6rw +s+PxGneec/kRPRgzjC/QHY6n8QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQBbyMqF +RDsX8zX1EW5qA8AQ8Jb2XqWrVeSO8blMV3WagJ2airMm3+c/82FCwsd/cZ08UXhA +/Kou0gi/F16tV26PiiUdp590Qao3d8H2qxc1rzzULimZPgxH4iA4vRyMHtyZN6h4 +7Fdn7O9xNMPu8siOz8rrzsEdEX5URbOMkDLCZsbTIUWVv2XmqrR0K10d5VuLWeLi +r+4G6c6jpa244WmqT9ClqceJ12G1Wnmezy7ybiW0l5M2iuIKFEiRP5Hj0J15o1I2 +pXAbKysAdWRHsJSQOtcgO8Vh9k0wo3tKg4HDp1hbrEzoGzOv92Vjg3lG8X+hzbMJ +MQURotHkD4Gk57wL +-----END CERTIFICATE----- diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key new file mode 100644 index 000000000000..1904ca7090ae --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/bitnami/certs/server.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA5NHl5TfZtO6zugau2tp5mWIcQYJhuwKTmYeXDLYAGJpoD2Si +xwPL5c8glneIRz1N2EQIZVeaWGbS0FLFlPdOkCkplpW9isYVC4XqKrk5b4HW4+YC ++Cup0k+Kd4NMeZOTUvWr5N6dIpdibkVumBc/pao8VtdwywlCL/PwGRsQtkXrRICz +dtRa3MXqTmEFfoyVCGgBRtronlB9x4Plfb8Psk4GrPkjrWYgO8peKrl0O5+F+sYg +7Gj95zCH73BQANzCVNrgD9fs9cyx3ru9CUdEoIxAAJwQFkjm7xr6xqhIlSgnQ7B0 +uOSTNRcXY6rws+PxGneec/kRPRgzjC/QHY6n8QIDAQABAoIBACo3G131tuGtpFTu +xLW11vdYZXQklNlGuWp63IBI162yVv54B5wF9Ek6tH1uIiNaiREcRBxGVEB4/+3V +R4SbN9Ba98RDbgu7TcipdTFaqOEMqFO1bNjSXWtip14zSBmqA2Ur1AHOnFj0awGD +J8tBhsmOpcEz0Ch1VdO5ApPvLV8jH9wQiMI/Q6yYQMtmzTMCUMYdMqe+LOziIOzL +oqN/WXnKL5E5TiO1bIxSpWPbT+IVn1c3/PShmvmRrLWsFUQlkwXJKMYZPO+rCCfe +b+Q9lMLMnj+vOnM3z16WC3aiiJGCZjVTvQ+x22YrBTRPxZmHO2eZ4H/cUQM7Y/tw +I7RjEM0CgYEA9Kxt1t8bWonzBii3P0rwyx0IECvg63k+pp4BpxpeWQKL7NVdSzk3 +AyJVcNjUoZgi2kVPdxzZGLrnZfuZ691xQB3oZF0LwBzQ4GFHkTRCB0s8ZA5lcJaI +9pBu91bhz2VOZSTeQWpdMMURjXVyTXZInU1mwzmjVOIAYmO33shH9gcCgYEA72mX +UoIrFPLkOTSZOb7UbjYH01vf6ThQiYCEWg7mD3CbY7n9oobIcQMzNnt7xN4wOl/V +eKfZ7G56q8enfqm45Dyo9aCBCENVzmwO8wLe5UnvJBNL20KjvtwG8w5A6UZQzC7p +3QS+U2zxVQNEeaE6a8Wrq2d1PlhVAHYw8odgNEcCgYBN38+58xrmrz99d1oTuAt5 +6kyVsRGOgPGS4HmQMRFUbT4R7DscZSKASd4945WRtTVqmWLYe4MRnvNlfzYXX0zb +ZmmAAClsRP+qWuwHaEWXwrd+9SIOOqtvJrta1/lZJFpWUOy4j10H18Flb7sosnwc +LPWHL4Iv0xriNfDg5Iga4wKBgQDLJBU59SkJBW+Q+oho7vrg6QeK15IOGbJ8eYfT +woCC6VFwNQh5N1QsUELMH8rNKJpTba18SzAl5ThBOY9tciVnw/C5Og9CK6BLHnUw +zWbDtxAq1BSxXsIB2EAtTBLX3MoB9myJFNVJhE7hi3w2mA8yEu+u6IIa/Ghjk+XE +ZAnFUQKBgQDjMinRZrK5wA09jcetI+dNiLnKHoQG6OaXDDsNCatex0O2F36BvVXE +P78qDz/i5aBMWsLx6VDvWJAkBIpZoNS5UsOn17tFaocGUSkcm48bs8Dn6VvsE8Bd +XMPAHyKuILlKYifBvNq5T22KhqKX7yGmk/AeOOiKr2KeMnh27JYrCA== +-----END RSA PRIVATE KEY----- diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/deflate.conf b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/deflate.conf new file mode 100644 index 000000000000..ca9bc1d6e4b6 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/deflate.conf @@ -0,0 +1,5 @@ + + AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css + AddOutputFilterByType DEFLATE application/x-javascript application/javascript application/ecmascript + AddOutputFilterByType DEFLATE application/rss+xml + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf new file mode 100644 index 000000000000..c0838da2a4e5 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/apache/conf/vhosts/00_status-vhost.conf @@ -0,0 +1,7 @@ + + ServerName status.localhost + + Require local + SetHandler server-status + + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh new file mode 100644 index 000000000000..ea3480702bb4 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-env.sh @@ -0,0 +1,69 @@ +#!/bin/bash +# +# Environment configuration for apache + +# The values for all environment variables will be set in the below order of precedence +# 1. Custom environment variables defined below after Bitnami defaults +# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR +# 3. Environment variables overridden via external files using *_FILE variables (see below) +# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) + +export BITNAMI_ROOT_DIR="/opt/bitnami" +export BITNAMI_VOLUME_DIR="/bitnami" + +# Logging configuration +export MODULE="${MODULE:-apache}" +export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" + +# By setting an environment variable matching *_FILE to a file path, the prefixed environment +# variable will be overridden with the value specified in that file +apache_env_vars=( + APACHE_HTTP_PORT_NUMBER + APACHE_HTTPS_PORT_NUMBER + APACHE_HTTP_PORT + APACHE_HTTPS_PORT +) +for env_var in "${apache_env_vars[@]}"; do + file_env_var="${env_var}_FILE" + if [[ -n "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + fi +done +unset apache_env_vars +export WEB_SERVER_TYPE="apache" + +# Paths +export APACHE_BASE_DIR="${BITNAMI_ROOT_DIR}/apache" +export APACHE_BIN_DIR="${APACHE_BASE_DIR}/bin" +export APACHE_CONF_DIR="${APACHE_BASE_DIR}/conf" +export APACHE_HTDOCS_DIR="${APACHE_BASE_DIR}/htdocs" +export APACHE_TMP_DIR="${APACHE_BASE_DIR}/var/run" +export APACHE_LOGS_DIR="${APACHE_BASE_DIR}/logs" +export APACHE_VHOSTS_DIR="${APACHE_CONF_DIR}/vhosts" +export APACHE_HTACCESS_DIR="${APACHE_VHOSTS_DIR}/htaccess" +export APACHE_MOD_PAGESPEED_CACHE_DIR="${APACHE_BASE_DIR}/var/cache" +export APACHE_CONF_FILE="${APACHE_CONF_DIR}/httpd.conf" +export APACHE_PID_FILE="${APACHE_TMP_DIR}/httpd.pid" +export PATH="${APACHE_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" + +# System users (when running with a privileged user) +export APACHE_DAEMON_USER="daemon" +export WEB_SERVER_DAEMON_USER="$APACHE_DAEMON_USER" +export APACHE_DAEMON_GROUP="daemon" +export WEB_SERVER_DAEMON_GROUP="$APACHE_DAEMON_GROUP" +export WEB_SERVER_GROUP="$APACHE_DAEMON_GROUP" + +# Apache configuration +export APACHE_DEFAULT_HTTP_PORT_NUMBER="8080" +export WEB_SERVER_DEFAULT_HTTP_PORT_NUMBER="$APACHE_DEFAULT_HTTP_PORT_NUMBER" # only used at build time +export APACHE_DEFAULT_HTTPS_PORT_NUMBER="8443" +export WEB_SERVER_DEFAULT_HTTPS_PORT_NUMBER="$APACHE_DEFAULT_HTTPS_PORT_NUMBER" # only used at build time +APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-"${APACHE_HTTP_PORT:-}"}" +export APACHE_HTTP_PORT_NUMBER="${APACHE_HTTP_PORT_NUMBER:-}" +export WEB_SERVER_HTTP_PORT_NUMBER="$APACHE_HTTP_PORT_NUMBER" +APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-"${APACHE_HTTPS_PORT:-}"}" +export APACHE_HTTPS_PORT_NUMBER="${APACHE_HTTPS_PORT_NUMBER:-}" +export WEB_SERVER_HTTPS_PORT_NUMBER="$APACHE_HTTPS_PORT_NUMBER" + +# Custom environment variables may be defined below diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh new file mode 100755 index 000000000000..7a907f80b477 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache-modphp/postunpack.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh +. /opt/bitnami/scripts/php-env.sh + +# Enable required Apache modules +apache_enable_module "mpm_prefork_module" +apache_enable_module "php7_module" "modules/libphp7.so" + +# Disable incompatible Apache modules +apache_disable_module "mpm_event_module" + +# Write Apache configuration +apache_php_conf_file="${APACHE_CONF_DIR}/bitnami/php.conf" +cat > "$apache_php_conf_file" < + ServerAlias * + {{additional_configuration}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl new file mode 100644 index 000000000000..b7e33c754376 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-https-vhost.conf.tpl @@ -0,0 +1,8 @@ +{{before_vhost_configuration}} + + ServerAlias * + SSLEngine on + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + {{additional_configuration}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl new file mode 100644 index 000000000000..c895e537502a --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-generic-prefix.conf.tpl @@ -0,0 +1 @@ +{{additional_configuration}} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl new file mode 100644 index 000000000000..97bc1927b542 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-http-vhost.conf.tpl @@ -0,0 +1,13 @@ +{{before_vhost_configuration}} + + ServerAlias * + DocumentRoot {{document_root}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + {{extra_directory_configuration}} + + {{additional_configuration}} + {{htaccess_include}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl new file mode 100644 index 000000000000..c6debd7f56d4 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-https-vhost.conf.tpl @@ -0,0 +1,16 @@ +{{before_vhost_configuration}} + + ServerAlias * + SSLEngine on + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + DocumentRoot {{document_root}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + {{extra_directory_configuration}} + + {{additional_configuration}} + {{htaccess_include}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl new file mode 100644 index 000000000000..fc0f6c218196 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-prefix.conf.tpl @@ -0,0 +1,9 @@ +{{prefix_conf}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + {{extra_directory_configuration}} + +{{additional_configuration}} +{{htaccess_include}} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl new file mode 100644 index 000000000000..e8a3788d8a62 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-http-vhost.conf.tpl @@ -0,0 +1,14 @@ +{{before_vhost_configuration}} +PassengerPreStart http://localhost:{{APACHE_DEFAULT_HTTP_PORT_NUMBER}}/ + + ServerAlias * + DocumentRoot {{document_root}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + PassengerEnabled on + {{extra_directory_configuration}} + + {{additional_configuration}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl new file mode 100644 index 000000000000..289a3b0959cd --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-https-vhost.conf.tpl @@ -0,0 +1,17 @@ +{{before_vhost_configuration}} +PassengerPreStart https://localhost:{{APACHE_DEFAULT_HTTPS_PORT_NUMBER}}/ + + ServerAlias * + SSLEngine on + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + DocumentRoot {{document_root}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + PassengerEnabled on + {{extra_directory_configuration}} + + {{additional_configuration}} + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl new file mode 100644 index 000000000000..2242d656b5a8 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/app-ruby-passenger-prefix.conf.tpl @@ -0,0 +1,9 @@ +{{prefix_conf}} + + Options -Indexes +FollowSymLinks -MultiViews + AllowOverride {{allow_override}} + {{acl_configuration}} + PassengerEnabled on + {{extra_directory_configuration}} + +{{additional_configuration}} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl new file mode 100644 index 000000000000..f1d31ed3ecc3 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami-ssl.conf.tpl @@ -0,0 +1,29 @@ +# Default SSL Virtual Host configuration. + + + LoadModule ssl_module modules/mod_ssl.so + + +Listen 443 +SSLProtocol all -SSLv2 -SSLv3 +SSLHonorCipherOrder on +SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS !EDH !RC4" +SSLPassPhraseDialog builtin +SSLSessionCache "shmcb:{{APACHE_LOGS_DIR}}/ssl_scache(512000)" +SSLSessionCacheTimeout 300 + + + DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" + SSLEngine on + SSLCertificateFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.crt" + SSLCertificateKeyFile "{{APACHE_CONF_DIR}}/bitnami/certs/server.key" + + + Options Indexes FollowSymLinks + AllowOverride All + Require all granted + + + # Error Documents + ErrorDocument 503 /503.html + diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl new file mode 100644 index 000000000000..6d3b22894445 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/bitnami-templates/bitnami.conf.tpl @@ -0,0 +1,18 @@ +# Default Virtual Host configuration. + +# Let Apache know we're behind a SSL reverse proxy +SetEnvIf X-Forwarded-Proto https HTTPS=on + + + DocumentRoot "{{APACHE_BASE_DIR}}/htdocs" + + Options Indexes FollowSymLinks + AllowOverride All + Require all granted + + + # Error Documents + ErrorDocument 503 /503.html + + +Include "{{APACHE_CONF_DIR}}/bitnami/bitnami-ssl.conf" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/entrypoint.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/entrypoint.sh new file mode 100755 index 000000000000..3d0e4ce6a903 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/entrypoint.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +#set -o xtrace + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/libbitnami.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +print_welcome_page + +if [[ "$*" == *"/opt/bitnami/scripts/apache/run.sh"* ]]; then + info "** Starting Apache setup **" + /opt/bitnami/scripts/apache/setup.sh + info "** Apache setup finished! **" +fi + +echo "" +exec "$@" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh new file mode 100755 index 000000000000..e7d67d19321d --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/postunpack.sh @@ -0,0 +1,115 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/liblog.sh + +######################## +# Sets up the default Bitnami configuration +# Globals: +# APACHE_* +# Arguments: +# None +# Returns: +# None +######################### +apache_setup_bitnami_config() { + local template_dir="${BITNAMI_ROOT_DIR}/scripts/apache/bitnami-templates" + + # Enable Apache modules + local -a modules_to_enable=( + "deflate_module" + "negotiation_module" + "proxy[^\s]*_module" + "rewrite_module" + "slotmem_shm_module" + "socache_shmcb_module" + "ssl_module" + "status_module" + "version_module" + ) + for module in "${modules_to_enable[@]}"; do + apache_enable_module "$module" + done + + # Disable Apache modules + local -a modules_to_disable=( + "http2_module" + "proxy_hcheck_module" + ) + for module in "${modules_to_disable[@]}"; do + apache_disable_module "$module" + done + + # Bitnami customizations + render-template "${template_dir}/bitnami.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf" + render-template "${template_dir}/bitnami-ssl.conf.tpl" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" + + # Add new configuration only once, to avoid a second postunpack run breaking Apache + local apache_conf_add + apache_conf_add="$(cat <>"$APACHE_CONF_FILE" < + RequestHeader unset Proxy + +EOF + fi +} + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +apache_setup_bitnami_config + +# Ensure non-root user has write permissions on a set of directories +for dir in "$APACHE_TMP_DIR" "$APACHE_CONF_DIR" "$APACHE_LOGS_DIR" "$APACHE_VHOSTS_DIR" "$APACHE_HTACCESS_DIR" "$APACHE_HTDOCS_DIR" "$APACHE_MOD_PAGESPEED_CACHE_DIR"; do + ensure_dir_exists "$dir" + chmod -R g+rwX "$dir" +done + +# Create 'apache2' symlink pointing to the 'apache' directory, for compatibility with Bitnami Docs guides +ln -sf apache "${BITNAMI_ROOT_DIR}/apache2" + +ln -sf "/dev/stdout" "${APACHE_LOGS_DIR}/access_log" +ln -sf "/dev/stderr" "${APACHE_LOGS_DIR}/error_log" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh new file mode 100755 index 000000000000..3bf21a282611 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/reload.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +info "** Reloading Apache configuration **" +exec "${APACHE_BIN_DIR}/apachectl" -k graceful diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh new file mode 100755 index 000000000000..8993aaa58d8e --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/restart.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libapache.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +/opt/bitnami/scripts/apache/stop.sh +/opt/bitnami/scripts/apache/start.sh diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/run.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/run.sh new file mode 100755 index 000000000000..1ab422dd4c31 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/run.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +info "** Starting Apache **" +exec "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" -D "FOREGROUND" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh new file mode 100755 index 000000000000..45cd178a4b7a --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/setup.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libapache.sh + +# Load Apache environment +. /opt/bitnami/scripts/apache-env.sh + +# Ensure Apache environment variables are valid +apache_validate + +# Ensure Apache daemon user exists when running as 'root' +am_i_root && ensure_user_exists "$APACHE_DAEMON_USER" "$APACHE_DAEMON_GROUP" + +# Ensure Apache is initialized +apache_initialize + +# Fix logging issue when running as root +! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh new file mode 100755 index 000000000000..8ea04e19f09e --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/start.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +error_code=0 + +if is_apache_not_running; then + "${APACHE_BIN_DIR}/httpd" -f "$APACHE_CONF_FILE" + if ! retry_while "is_apache_running"; then + error "apache did not start" + error_code=1 + else + info "apache started" + fi +else + info "apache is already running" +fi + +exit "${error_code}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh new file mode 100755 index 000000000000..c6f434dd4407 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/status.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +if is_apache_running; then + info "apache is already running" +else + info "apache is not running" +fi diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh new file mode 100755 index 000000000000..be22ca14ebb7 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/apache/stop.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libapache.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load Apache environment variables +. /opt/bitnami/scripts/apache-env.sh + +error_code=0 + +if is_apache_running; then + BITNAMI_QUIET=1 apache_stop + if ! retry_while "is_apache_not_running"; then + error "apache could not be stopped" + error_code=1 + else + info "apache stopped" + fi +else + info "apache is not running" +fi + +exit "${error_code}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libapache.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libapache.sh new file mode 100644 index 000000000000..ff262cb594a7 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libapache.sh @@ -0,0 +1,687 @@ +#!/bin/bash +# +# Bitnami Apache library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libfile.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libservice.sh + +######################## +# Validate settings in APACHE_* env vars +# Globals: +# APACHE_* +# Arguments: +# None +# Returns: +# None +######################### +apache_validate() { + debug "Validating settings in APACHE_* environment variables" + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + + check_allowed_port() { + local port_var="${1:?missing port variable}" + local -a validate_port_args=() + ! am_i_root && validate_port_args+=("-unprivileged") + validate_port_args+=("${!port_var}") + if ! err=$(validate_port "${validate_port_args[@]}"); then + print_validation_error "An invalid port was specified in the environment variable ${port_var}: ${err}." + fi + } + + [[ -w "$APACHE_CONF_FILE" ]] || warn "The Apache configuration file '${APACHE_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied." + + if [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]]; then + if [[ "$APACHE_HTTP_PORT_NUMBER" -eq "$APACHE_HTTPS_PORT_NUMBER" ]]; then + print_validation_error "APACHE_HTTP_PORT_NUMBER and APACHE_HTTPS_PORT_NUMBER are bound to the same port!" + fi + fi + + [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTP_PORT_NUMBER + [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && check_allowed_port APACHE_HTTPS_PORT_NUMBER + + [[ "$error_code" -eq 0 ]] || exit "$error_code" +} + +######################## +# Configure Apache's HTTP port +# Globals: +# APACHE_CONF_FILE, APACHE_CONF_DIR +# Arguments: +# None +# Returns: +# None +######################### +apache_configure_http_port() { + local -r port=${1:?missing port} + local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|" + local -r server_name_exp="s|^\s*#?\s*ServerName\s+([^:\s]+)(:[0-9]+)?$|ServerName \1:${port}|" + local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|" + local apache_configuration + + if [[ -w "$APACHE_CONF_FILE" ]]; then + debug "Configuring port ${port} on file ${APACHE_CONF_FILE}" + apache_configuration="$(sed -E -e "$listen_exp" -e "$server_name_exp" "$APACHE_CONF_FILE")" + echo "$apache_configuration" > "$APACHE_CONF_FILE" + fi + + if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami.conf" ]]; then + debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami.conf" + apache_configuration="$(sed -E "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami.conf")" + echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami.conf" + fi + + if [[ -w "${APACHE_VHOSTS_DIR}/00_status-vhost.conf" ]]; then + debug "Configuring port ${port} on file ${APACHE_VHOSTS_DIR}/00_status-vhost.conf" + apache_configuration="$(sed -E "$vhost_exp" "${APACHE_VHOSTS_DIR}/00_status-vhost.conf")" + echo "$apache_configuration" > "${APACHE_VHOSTS_DIR}/00_status-vhost.conf" + fi +} + +######################## +# Configure Apache's HTTPS port +# Globals: +# APACHE_CONF_DIR +# Arguments: +# None +# Returns: +# None +######################### +apache_configure_https_port() { + local -r port=${1:?missing port} + local -r listen_exp="s|^\s*Listen\s+([^:]*:)?[0-9]+\s*$|Listen ${port}|" + local -r vhost_exp="s|VirtualHost\s+([^:>]+)(:[0-9]+)|VirtualHost \1:${port}|" + local apache_configuration + + if [[ -w "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" ]]; then + debug "Configuring port ${port} on file ${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" + apache_configuration="$(sed -E -e "$listen_exp" -e "$vhost_exp" "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf")" + echo "$apache_configuration" > "${APACHE_CONF_DIR}/bitnami/bitnami-ssl.conf" + fi +} + +######################## +# Ensure Apache is initialized +# Globals: +# APACHE_* +# Arguments: +# None +# Returns: +# None +######################### +apache_initialize() { + # Copy vhosts files + if ! is_dir_empty "/vhosts"; then + info "Found mounted virtual hosts in '/vhosts'. Copying them to '${APACHE_BASE_DIR}/conf/vhosts'" + cp -Lr "/vhosts/." "${APACHE_VHOSTS_DIR}" + fi + + # Mount certificate files + if ! is_dir_empty "${APACHE_BASE_DIR}/certs"; then + warn "The directory '${APACHE_BASE_DIR}/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" + warn "Restoring certificates at '${APACHE_BASE_DIR}/certs' to '${APACHE_CONF_DIR}/bitnami/certs'" + rm -rf "${APACHE_CONF_DIR}/bitnami/certs" + ln -sf "${APACHE_BASE_DIR}/certs" "${APACHE_CONF_DIR}/bitnami/certs" + elif ! is_dir_empty "/certs"; then + info "Mounting certificates files from '/certs'" + rm -rf "${APACHE_CONF_DIR}/bitnami/certs" + ln -sf "/certs" "${APACHE_CONF_DIR}/bitnami/certs" + fi + + # Mount application files + if ! is_dir_empty "/app"; then + info "Mounting application files from '/app'" + rm -rf "$APACHE_HTDOCS_DIR" + ln -sf "/app" "$APACHE_HTDOCS_DIR" + fi + + # Port configuration + [[ -n "$APACHE_HTTP_PORT_NUMBER" ]] && info "Configuring the HTTP port" && apache_configure_http_port "$APACHE_HTTP_PORT_NUMBER" + [[ -n "$APACHE_HTTPS_PORT_NUMBER" ]] && info "Configuring the HTTPS port" && apache_configure_https_port "$APACHE_HTTPS_PORT_NUMBER" + + # Restore persisted configuration files (deprecated) + if ! is_dir_empty "/bitnami/apache/conf"; then + warn "The directory '/bitnami/apache/conf' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '${APACHE_CONF_DIR}' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#full-configuration" + warn "Restoring configuration at '/bitnami/apache/conf' to '${APACHE_CONF_DIR}'" + rm -rf "$APACHE_CONF_DIR" + ln -sf "/bitnami/apache/conf" "$APACHE_CONF_DIR" + fi +} + +######################## +# Enable a module in the Apache configuration file +# Globals: +# APACHE_CONF_FILE +# Arguments: +# $1 - Module to enable +# $2 - Path to module .so file (optional if already defined in httpd.conf) +# Returns: +# None +######################### +apache_enable_module() { + local -r name="${1:?missing name}" + local -r file="${2:-}" + local -r regex="[#\s]*(LoadModule\s+${name}\s+.*)$" + local apache_configuration + + if [[ -w "$APACHE_CONF_FILE" ]]; then + debug "Enabling module '${name}'" + if grep -q -E "$regex" "$APACHE_CONF_FILE"; then + # Uncomment line if the module was already defined + replace_in_file "$APACHE_CONF_FILE" "$regex" "\1" + elif [[ -n "$file" ]]; then + # Add right after the last LoadModule, so all Apache modules are organized in the same section of the file + append_file_after_last_match "$APACHE_CONF_FILE" "^[#\s]*LoadModule" "LoadModule ${name} ${file}" + else + error "Module ${name} was not defined in ${APACHE_CONF_FILE}. Please specify the 'file' parameter for 'apache_enable_module'." + fi + fi +} + +######################## +# Disable a module in the Apache configuration file +# Globals: +# APACHE_CONF_FILE +# Arguments: +# $1 - Module to disable +# Returns: +# None +######################### +apache_disable_module() { + local -r name="${1:?missing name}" + local -r file="${2:-}" + local -r regex="[#\s]*(LoadModule\s+${name}\s+.*)$" + local apache_configuration + + if [[ -w "$APACHE_CONF_FILE" ]]; then + debug "Disabling module '${name}'" + replace_in_file "$APACHE_CONF_FILE" "$regex" "#\1" + fi +} + +######################## +# Stop Apache +# Globals: +# APACHE_* +# Arguments: +# None +# Returns: +# None +######################### +apache_stop() { + is_apache_not_running && return + stop_service_using_pid "$APACHE_PID_FILE" +} + +######################## +# Check if Apache is running +# Globals: +# APACHE_PID_FILE +# Arguments: +# None +# Returns: +# Whether Apache is running +######################## +is_apache_running() { + local pid + pid="$(get_pid_from_file "$APACHE_PID_FILE")" + if [[ -n "$pid" ]]; then + is_service_running "$pid" + else + false + fi +} + +######################## +# Check if Apache is running +# Globals: +# APACHE_PID_FILE +# Arguments: +# None +# Returns: +# Whether Apache is not running +######################## +is_apache_not_running() { + ! is_apache_running +} + +######################## +# Ensure configuration gets added to the main Apache configuration file +# Globals: +# APACHE_* +# Arguments: +# $1 - configuration string +# $2 - pattern to use for checking if the configuration already exists (default: $1) +# Returns: +# None +######################## +ensure_apache_configuration_exists() { + local -r conf="${1:?conf missing}" + local -r pattern="${2:-"$conf"}" + # Enable configuration by appending to httpd.conf + if ! grep -E -q "$pattern" "$APACHE_CONF_FILE"; then + if is_file_writable "$APACHE_CONF_FILE"; then + cat >> "$APACHE_CONF_FILE" <<< "$conf" + else + error "Could not add the following configuration to '${APACHE_CONF_FILE}:" + error "" + error "$(indent "$conf" 4)" + error "" + error "Include the configuration manually and try again." + return 1 + fi + fi +} + +######################## +# Collect all the .htaccess files from /opt/bitnami/$name and write the result in the 'htaccess' directory +# Globals: +# APACHE_* +# Arguments: +# $1 - App name +# $2 - Overwrite the original .htaccess with the explanation text (defaults to 'yes') +# Flags: +# --document-root - Path to document root directory +# Returns: +# None +######################## +apache_replace_htaccess_files() { + local -r app="${1:?missing app}" + local -r result_file="${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" + # Default options + local document_root="${BITNAMI_ROOT_DIR}/${app}" + local overwrite="yes" + local -a htaccess_files + local htaccess_dir + local htaccess_contents + # Validate arguments + shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + --document-root) + shift + document_root="$1" + ;; + --overwrite) + shift + overwrite="$1" + ;; + *) + echo "Invalid command line flag ${1}" >&2 + return 1 + ;; + esac + shift + done + # Locate all .htaccess files inside the document root + read -r -a htaccess_files <<< "$(find "$document_root" -name .htaccess -print0 | xargs -0)" + [[ "${#htaccess_files[@]}" = 0 ]] && return + for htaccess_file in "${htaccess_files[@]}"; do + htaccess_dir="$(dirname "$htaccess_file")" + htaccess_contents="$(indent "$(< "$htaccess_file")" 2)" + # Skip if it was already included to the resulting htaccess file + if grep -q "^" <<< "$htaccess_contents"; then + continue + fi + # Add to the htaccess file + cat >> "$result_file" < +${htaccess_contents} + +EOF + # Overwrite the original .htaccess with the explanation text + if is_boolean_yes "$overwrite"; then + echo "# This configuration has been moved to the ${result_file} config file for performance and security reasons" > "$htaccess_file" + fi + done +} + +######################## +# Ensure an Apache application configuration exists (in virtual host format) +# Globals: +# APACHE_* +# Arguments: +# $1 - App name +# Flags: +# --hosts - Hosts to enable +# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) +# --allow-remote-connections - Whether to allow remote connections or to require local connections +# --disabled - Whether to render the file with a .disabled prefix +# --enable-https - Enable app configuration on HTTPS port +# --http-port - HTTP port number +# --https-port - HTTPS port number +# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# --additional-configuration - Additional vhost configuration (no default) +# --before-vhost-configuration - Configuration to add before the directive (no default) +# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --document-root - Path to document root directory +# --extra-directory-configuration - Extra configuration for the document root directory +# Returns: +# true if the configuration was enabled, false otherwise +######################## +ensure_apache_app_configuration_exists() { + local -r app="${1:?missing app}" + # Default options + local -a hosts=("127.0.0.1" "_default_") + local type="" + local allow_remote_connections="yes" + local disabled="no" + local enable_https="yes" + local http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" + local https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + local move_htaccess="yes" + local var_name + # Template variables defaults + export additional_configuration="" + export before_vhost_configuration="" + export allow_override="All" + export document_root="${BITNAMI_ROOT_DIR}/${app}" + export extra_directory_configuration="" + # Validate arguments + shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + --hosts) + shift + read -r -a hosts <<< "$1" + ;; + --type \ + | --allow-remote-connections \ + | --disabled \ + | --enable-https \ + | --http-port \ + | --https-port \ + | --move-htaccess \ + | --additional-configuration \ + | --before-vhost-configuration \ + | --allow-override \ + | --document-root \ + | --extra-directory-configuration \ + ) + var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" + shift + export "${var_name}"="$1" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + # Construct host string in the format of "host1:port1[ host2:port2[ ...]]" + export http_listen_addresses="" + export https_listen_addresses="" + for host in "${hosts[@]}"; do + http_listen="${host}:${http_port}" + https_listen="${host}:${https_port}" + [[ -z "${http_listen_addresses:-}" ]] && http_listen_addresses="$http_listen" || http_listen_addresses="${http_listen_addresses} ${http_listen}" + [[ -z "${https_listen_addresses:-}" ]] && https_listen_addresses="$https_listen" || https_listen_addresses="${https_listen_addresses} ${https_listen}" + done + # App .htaccess support + export htaccess_include + is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" + if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then + allow_override="None" + htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" + else + allow_override="$allow_override" + htaccess_include="" + fi + # ACL configuration + export acl_configuration + if is_boolean_yes "$allow_remote_connections"; then + acl_configuration="Require all granted" + else + acl_configuration="$(cat < "$http_vhost" + elif [[ ! -f "$http_vhost" ]]; then + error "Could not create virtual host for ${app} at '${http_vhost}'. Check permissions and ownership for parent directories." + return 1 + else + warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." + fi + if is_boolean_yes "$enable_https"; then + if is_file_writable "$https_vhost"; then + # Create file with root group write privileges, so it can be modified in non-root containers + [[ ! -f "$https_vhost" ]] && touch "$https_vhost" && chmod g+rw "$https_vhost" + render-template "${template_dir}/${template_name}-https-vhost.conf.tpl" | sed '/^\s*$/d' > "$https_vhost" + elif [[ ! -f "$https_vhost" ]]; then + error "Could not create virtual host for ${app} at '${https_vhost}'. Check permissions and ownership for parent directories." + return 1 + else + warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." + fi + fi +} + +######################## +# Ensure an Apache application configuration does not exist anymore (in virtual hosts format) +# Globals: +# * +# Arguments: +# $1 - App name +# Returns: +# true if the configuration was disabled, false otherwise +######################## +ensure_apache_app_configuration_not_exists() { + local -r app="${1:?missing app}" + local -r http_vhost="${APACHE_VHOSTS_DIR}/${app}-vhost.conf" + local -r https_vhost="${APACHE_VHOSTS_DIR}/${app}-https-vhost.conf" + # Note that 'rm -f' will not fail if the files don't exist + # However if we lack permissions to remove the file, it will result in a non-zero exit code, as expected by this function + rm -f "$http_vhost" "$https_vhost" +} + +######################## +# Ensure Apache loads the configuration for an application in a URL prefix +# Globals: +# APACHE_* +# Arguments: +# $1 - App name +# Flags: +# --type - Application type, which has an effect on what configuration template will be used, allowed values: php, (empty) +# --allow-remote-connections - Whether to allow remote connections or to require local connections +# --move-htaccess - Move .htaccess files to a common place so they can be loaded during Apache startup +# --prefix - URL prefix from where it will be accessible (i.e. /myapp) +# --additional-configuration - Additional vhost configuration (no default) +# --allow-override - Whether to allow .htaccess files (only allowed when --move-htaccess is set to 'no') +# --document-root - Path to document root directory +# --extra-directory-configuration - Extra configuration for the document root directory +# Returns: +# true if the configuration was enabled, false otherwise +######################## +ensure_apache_prefix_configuration_exists() { + local -r app="${1:?missing app}" + # Default options + local type="" + local allow_remote_connections="yes" + local move_htaccess="yes" + local prefix="/${app}" + local var_name + # Template variables defaults + export additional_configuration="" + export allow_override="All" + export document_root="${BITNAMI_ROOT_DIR}/${app}" + export extra_directory_configuration="" + # Validate arguments + shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + --type \ + | --allow-remote-connections \ + | --move-htaccess \ + | --prefix \ + | --additional-configuration \ + | --allow-override \ + | --document-root \ + | --extra-directory-configuration \ + ) + var_name="$(echo "$1" | sed -e "s/^--//" -e "s/-/_/g")" + shift + declare "${var_name}"="$1" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + # App .htaccess support + export htaccess_include + is_boolean_yes "$move_htaccess" && apache_replace_htaccess_files "$app" --document-root "$document_root" + if [[ -f "${APACHE_HTACCESS_DIR}/${app}-htaccess.conf" ]]; then + allow_override="None" + htaccess_include="Include \"${APACHE_HTACCESS_DIR}/${app}-htaccess.conf\"" + else + allow_override="$allow_override" + htaccess_include="" + fi + # ACL configuration + export acl_configuration + if is_boolean_yes "$allow_remote_connections"; then + acl_configuration="Require all granted" + else + acl_configuration="$(cat < "$prefix_file" + ensure_apache_configuration_exists "Include \"$prefix_file\"" + elif [[ ! -f "$prefix_file" ]]; then + error "Could not create web server configuration file for ${app} at '${prefix_file}'. Check permissions and ownership for parent directories." + return 1 + else + warn "The ${app} web server configuration file '${prefix_file}' is not writable. Configurations based on environment variables will not be applied for this file." + fi +} + +######################## +# Ensure Apache application configuration is updated with the runtime configuration (i.e. ports) +# Globals: +# * +# Arguments: +# $1 - App name +# Flags: +# --hosts - Hosts to enable +# --enable-https - Update HTTPS app configuration +# --http-port - HTTP port number +# --https-port - HTTPS port number +# Returns: +# true if the configuration was updated, false otherwise +######################## +apache_update_app_configuration() { + local -r app="${1:?missing app}" + # Default options + local -a hosts=("127.0.0.1" "_default_") + local enable_https="yes" + local http_port="${APACHE_HTTP_PORT_NUMBER:-"$APACHE_DEFAULT_HTTP_PORT_NUMBER"}" + local https_port="${APACHE_HTTPS_PORT_NUMBER:-"$APACHE_DEFAULT_HTTPS_PORT_NUMBER"}" + # Validate arguments + shift + while [[ "$#" -gt 0 ]]; do + case "$1" in + --hosts) + shift + read -r -a hosts <<< "$1" + ;; + + # Common flags + --enable-https \ + | --http-port \ + | --https-port \ + ) + args+=("$1" "$2") + shift + ;; + + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + # Construct host string in the format of "host1:port1[ host2:port2[ ...]]" + export http_listen_addresses="" + export https_listen_addresses="" + for host in "${hosts[@]}"; do + http_listen="${host}:${http_port}" + https_listen="${host}:${https_port}" + [[ -z "${http_listen_addresses:-}" ]] && http_listen_addresses="$http_listen" || http_listen_addresses="${http_listen_addresses} ${http_listen}" + [[ -z "${https_listen_addresses:-}" ]] && https_listen_addresses="$https_listen" || https_listen_addresses="${https_listen_addresses} ${https_listen}" + done + # Update configuration + local -r http_vhost="${APACHE_VHOSTS_DIR}/${app}-vhost.conf" + local -r https_vhost="${APACHE_VHOSTS_DIR}/${app}-https-vhost.conf" + if is_file_writable "$http_vhost"; then + replace_in_file "$http_vhost" "^$" "" + else + warn "The ${app} virtual host file '${http_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." + fi + if is_boolean_yes "$enable_https"; then + if is_file_writable "$https_vhost"; then + replace_in_file "$https_vhost" "^$" "" + else + warn "The ${app} virtual host file '${https_vhost}' is not writable. Configurations based on environment variables will not be applied for this file." + fi + fi +} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh new file mode 100644 index 000000000000..e7e95782e827 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libmysqlclient.sh @@ -0,0 +1,988 @@ +#!/bin/bash +# +# Bitnami MySQL Client library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libvalidations.sh + +######################## +# Validate settings in MYSQL_CLIENT_* environment variables +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_client_validate() { + info "Validating settings in MYSQL_CLIENT_* env vars" + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + + empty_password_enabled_warn() { + warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." + } + empty_password_error() { + print_validation_error "The $1 environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow the container to be started with blank passwords. This is recommended only for development." + } + backslash_password_error() { + print_validation_error "The password cannot contain backslashes ('\'). Set the environment variable $1 with no backslashes (more info at https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html)" + } + + check_yes_no_value() { + if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then + print_validation_error "The allowed values for ${1} are: yes no" + fi + } + + # Only validate environment variables if any action needs to be performed + check_yes_no_value "DB_TLS_ENABLED" + + if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then + if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then + empty_password_enabled_warn + else + if [[ -z "$DB_ROOT_PASSWORD" ]]; then + empty_password_error "$(get_env_var ROOT_PASSWORD)" + fi + if [[ -n "$DB_CREATE_DATABASE_USER" ]] && [[ -z "$DB_CREATE_DATABASE_PASSWORD" ]]; then + empty_password_error "$(get_env_var CREATE_DATABASE_PASSWORD)" + fi + fi + if [[ "${DB_ROOT_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "$(get_env_var ROOT_PASSWORD)" + fi + if [[ "${DB_CREATE_DATABASE_PASSWORD:-}" = *\\* ]]; then + backslash_password_error "$(get_env_var CREATE_DATABASE_PASSWORD)" + fi + fi + return "$error_code" +} + +######################## +# Perform actions to a database +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_client_initialize() { + # Wrap binary to force the usage of TLS + if is_boolean_yes "$DB_TLS_ENABLED"; then + mysql_client_wrap_binary_for_tls + fi + # Wait for the database to be accessible if any action needs to be performed + if [[ -n "$DB_CREATE_DATABASE_USER" || -n "$DB_CREATE_DATABASE_NAME" ]]; then + info "Trying to connect to the database server" + check_mysql_connection() { + echo "SELECT 1" | mysql_execute "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" "-h" "$DB_DATABASE_HOST" "-P" "$DB_DATABASE_PORT_NUMBER" + } + if ! retry_while "check_mysql_connection"; then + error "Could not connect to the database server" + return 1 + fi + fi + # Ensure a database user exists in the server + if [[ -n "$DB_CREATE_DATABASE_USER" ]]; then + info "Creating database user ${DB_CREATE_DATABASE_USER}" + local -a args=("$DB_CREATE_DATABASE_USER" "--host" "$DB_DATABASE_HOST" "--port" "$DB_DATABASE_PORT_NUMBER") + [[ -n "$DB_CREATE_DATABASE_PASSWORD" ]] && args+=("-p" "$DB_CREATE_DATABASE_PASSWORD") + [[ -n "$DB_DATABASE_AUTHENTICATION_PLUGIN" ]] && args+=("--auth-plugin" "$DB_DATABASE_AUTHENTICATION_PLUGIN") + mysql_ensure_optional_user_exists "${args[@]}" + fi + # Ensure a database exists in the server (and that the user has write privileges, if specified) + if [[ -n "$DB_CREATE_DATABASE_NAME" ]]; then + info "Creating database ${DB_CREATE_DATABASE_NAME}" + local -a createdb_args=("$DB_CREATE_DATABASE_NAME" "--host" "$DB_DATABASE_HOST" "--port" "$DB_DATABASE_PORT_NUMBER") + [[ -n "$DB_CREATE_DATABASE_USER" ]] && createdb_args+=("-u" "$DB_CREATE_DATABASE_USER") + [[ -n "$DB_CREATE_DATABASE_CHARACTER_SET" ]] && createdb_args+=("--character-set" "$DB_CREATE_DATABASE_CHARACTER_SET") + [[ -n "$DB_CREATE_DATABASE_COLLATE" ]] && createdb_args+=("--collate" "$DB_CREATE_DATABASE_COLLATE") + mysql_ensure_optional_database_exists "${createdb_args[@]}" + fi +} + +######################## +# Wrap binary to force the usage of TLS +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_client_wrap_binary_for_tls() { + local -r wrapper_file="${DB_BIN_DIR}/mysql" + local -r wrapped_binary_file="${DB_BASE_DIR}/.bin/mysql" + + mv "$wrapper_file" "$wrapped_binary_file" + cat >"$wrapper_file" <=8 depends on this command + # users are not configured on slave nodes during initialization due to --skip-slave-start + wait_for_mysql + + # Special configuration flag for system with slow disks that could take more time + # in initializing + if [[ -n "${DB_INIT_SLEEP_TIME}" ]]; then + debug "Sleeping ${DB_INIT_SLEEP_TIME} seconds before continuing with initialization" + sleep "${DB_INIT_SLEEP_TIME}" + fi +} + +######################## +# Wait for MySQL/MariaDB to be running +# Globals: +# DB_TMP_DIR +# Arguments: +# None +# Returns: +# Boolean +######################### +wait_for_mysql() { + local pid + local -r retries=300 + local -r sleep_time=2 + if ! retry_while is_mysql_running "$retries" "$sleep_time"; then + error "MySQL failed to start" + return 1 + fi +} + +######################## +# Wait for MySQL/MariaDB to be ready for accepting connections +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +wait_for_mysql_access() { + # wait until the server is up and answering queries. + local -r user="${1:-root}" + local -a args=("mysql" "$user") + is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("$(get_master_env_var_value ROOT_PASSWORD)") + local -r retries=300 + local -r sleep_time=2 + is_mysql_accessible() { + echo "select 1" | mysql_execute "${args[@]}" + } + if ! retry_while is_mysql_accessible "$retries" "$sleep_time"; then + error "Timed out waiting for MySQL to be accessible" + return 1 + fi +} + +######################## +# Stop MySQL/Mariadb +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_stop() { + ! is_mysql_running && return + + info "Stopping $DB_FLAVOR" + stop_service_using_pid "$DB_PID_FILE" +} + +######################## +# Initialize database data +# Globals: +# BITNAMI_DEBUG +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_install_db() { + local command="${DB_BIN_DIR}/mysql_install_db" + local -a args=("--defaults-file=${DB_CONF_FILE}" "--basedir=${DB_BASE_DIR}" "--datadir=${DB_DATA_DIR}") + am_i_root && args=("${args[@]}" "--user=$DB_DAEMON_USER") + if [[ "$DB_FLAVOR" = "mysql" ]]; then + command="${DB_BIN_DIR}/mysqld" + args+=("--initialize-insecure") + else + args+=("--auth-root-authentication-method=normal") + fi + debug_execute "$command" "${args[@]}" +} + +######################## +# Upgrade Database Schema +# Globals: +# BITNAMI_DEBUG +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_upgrade() { + local -a args=("--defaults-file=${DB_CONF_FILE}" "-u" "$DB_ROOT_USER" "--force") + local major_version minor_version patch_version + major_version="$(get_sematic_version "$(mysql_get_version)" 1)" + minor_version="$(get_sematic_version "$(mysql_get_version)" 2)" + patch_version="$(get_sematic_version "$(mysql_get_version)" 3)" + info "Running mysql_upgrade" + if [[ "$DB_FLAVOR" = "mysql" ]] && [[ + "$major_version" -gt "8" + || ( "$major_version" -eq "8" && "$minor_version" -gt "0" ) + || ( "$major_version" -eq "8" && "$minor_version" -eq "0" && "$patch_version" -ge "16" ) + ]]; then + mysql_stop + mysql_start_bg "--upgrade=FORCE" + else + mysql_start_bg + is_boolean_yes "${ROOT_AUTH_ENABLED:-false}" && args+=("-p$(get_master_env_var_value ROOT_PASSWORD)") + debug_execute "${DB_BIN_DIR}/mysql_upgrade" "${args[@]}" + fi +} + +######################## +# Migrate old custom configuration files +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +migrate_old_configuration() { + local -r old_custom_conf_file="$DB_VOLUME_DIR/conf/my_custom.cnf" + local -r custom_conf_file="$DB_CONF_DIR/bitnami/my_custom.cnf" + debug "Persisted configuration detected. Migrating any existing 'my_custom.cnf' file to new location" + warn "Custom configuration files are not persisted any longer" + if [[ -f "$old_custom_conf_file" ]]; then + info "Adding old custom configuration to user configuration" + echo "" >> "$custom_conf_file" + cat "$old_custom_conf_file" >> "$custom_conf_file" + fi + if am_i_root; then + [[ -e "$DB_VOLUME_DIR/.initialized" ]] && rm "$DB_VOLUME_DIR/.initialized" + rm -rf "$DB_VOLUME_DIR/conf" + else + warn "Old custom configuration migrated, please manually remove the 'conf' directory from the volume use to persist data" + fi +} + +######################## +# Ensure a db user exists with the given password for the '%' host +# Globals: +# DB_* +# Flags: +# -p|--password - database password +# -u|--user - database user +# --auth-plugin - authentication plugin +# --use-ldap - authenticate user via LDAP +# --host - database host +# --port - database host +# Arguments: +# $1 - database user +# Returns: +# None +######################### +mysql_ensure_user_exists() { + local -r user="${1:?user is required}" + local password="" + local auth_plugin="" + local use_ldap="no" + local hosts + local auth_string="" + local ssl_ca="" + # For accessing an external database + local db_host="" + local db_port="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + -p|--password) + shift + password="${1:?missing database password}" + ;; + --auth-plugin) + shift + auth_plugin="${1:?missing authentication plugin}" + ;; + --use-ldap) + use_ldap="yes" + ;; + --ssl-ca) + shift + ssl_ca="${1:?missing path to ssl CA}" + ;; + --host) + shift + db_host="${1:?missing database host}" + ;; + --port) + shift + db_port="${1:?missing database port}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + if is_boolean_yes "$use_ldap"; then + auth_string="identified via pam using '$DB_FLAVOR'" + elif [[ -n "$password" ]]; then + if [[ -n "$auth_plugin" ]]; then + auth_string="identified with $auth_plugin by \"$password\"" + else + auth_string="identified by \"$password\"" + fi + fi + debug "creating database user \'$user\'" + local -a opts=() + [[ -n "$db_host" ]] && opts+=("-h" "${db_host}") + [[ -n "$db_port" ]] && opts+=("-P" "${db_port}") + [[ -n "$ssl_ca" ]] && opts+=("--ssl-ca" "$ssl_ca") + local mysql_create_user_cmd + [[ "$DB_FLAVOR" = "mariadb" ]] && mysql_create_user_cmd="create or replace user" || mysql_create_user_cmd="create user if not exists" + mysql_execute "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" "${opts[@]:-}" <=10.4, the mysql.user table was replaced with a view: https://mariadb.com/kb/en/mysqluser-table/ + # Views have a definer user, in this case set to 'root', which needs to exist for the view to work + # In MySQL, to avoid issues when renaming the root user, they use the 'mysql.sys' user as a definer: https://dev.mysql.com/doc/refman/5.7/en/sys-schema.html + # However, for MariaDB that is not the case, so when the 'root' user is renamed the 'mysql.user' table stops working and the view needs to be fixed + if [[ "$user" != "root" && ! "$(mysql_get_version)" =~ ^10.[0123]. ]]; then + alter_view_str="$(mysql_execute_print_output "mysql" "$user" "$password" "-s" <&2 + return 1 + ;; + esac + shift + done + + local -a extra_args=() + [[ -n "$character_set" ]] && extra_args=("character set = '${character_set}'") + [[ -n "$collate" ]] && extra_args=("collate = '${collate}'") + + local -a mysql_execute_cmd=("mysql_execute") + [[ -n "$db_host" && -n "$db_port" ]] && mysql_execute_cmd=("mysql_remote_execute" "$db_host" "$db_port") + + debug "Creating database $database" + "${mysql_execute_cmd[@]}" "mysql" "$DB_ROOT_USER" "$DB_ROOT_PASSWORD" <&2 + return 1 + ;; + esac + shift + done + + local -a flags=("$user") + [[ -n "$db_host" ]] && flags+=("--host" "${db_host}") + [[ -n "$db_port" ]] && flags+=("--port" "${db_port}") + if is_boolean_yes "$use_ldap"; then + flags+=("--use-ldap") + elif [[ -n "$password" ]]; then + flags+=("-p" "$password") + [[ -n "$auth_plugin" ]] && flags=("${flags[@]}" "--auth-plugin" "$auth_plugin") + fi + mysql_ensure_user_exists "${flags[@]}" +} + +######################## +# Optionally create the given database, and then optionally give a user +# full privileges on the database. +# Flags: +# -u|--user - database user +# --character-set - character set +# --collation - collation +# --host - database host +# --port - database port +# Arguments: +# $1 - database name +# Returns: +# None +######################### +mysql_ensure_optional_database_exists() { + local -r database="${1:?database is missing}" + local character_set="" + local collate="" + local user="" + # For accessing an external database + local db_host="" + local db_port="" + + # Validate arguments + shift 1 + while [ "$#" -gt 0 ]; do + case "$1" in + --character-set) + shift + character_set="${1:?missing character set}" + ;; + --collate) + shift + collate="${1:?missing collate}" + ;; + -u|--user) + shift + user="${1:?missing database user}" + ;; + --host) + shift + db_host="${1:?missing database host}" + ;; + --port) + shift + db_port="${1:?missing database port}" + ;; + *) + echo "Invalid command line flag $1" >&2 + return 1 + ;; + esac + shift + done + + local -a flags=("$database") + [[ -n "$character_set" ]] && flags+=("--character-set" "$character_set") + [[ -n "$collate" ]] && flags+=("--collate" "$collate") + [[ -n "$db_host" ]] && flags+=("--host" "$db_host") + [[ -n "$db_port" ]] && flags+=("--port" "$db_port") + mysql_ensure_database_exists "${flags[@]}" + + if [[ -n "$user" ]]; then + local -a grant_flags=("$user" "$database") + [[ -n "$db_host" ]] && grant_flags+=("$db_host") + [[ -n "$db_port" ]] && grant_flags+=("$db_port") + mysql_ensure_user_has_database_privileges "${grant_flags[@]}" + fi +} + +######################## +# Add or modify an entry in the MySQL configuration file ("$DB_CONF_FILE") +# Globals: +# DB_* +# Arguments: +# $1 - MySQL variable name +# $2 - Value to assign to the MySQL variable +# $3 - Section in the MySQL configuration file the key is located (default: mysqld) +# $4 - Configuration file (default: "$BD_CONF_FILE") +# Returns: +# None +######################### +mysql_conf_set() { + local -r key="${1:?key missing}" + local -r value="${2:?value missing}" + read -r -a sections <<<"${3:-mysqld}" + local -r file="${4:-"$DB_CONF_FILE"}" + info "Setting ${key} option" + debug "Setting ${key} to '${value}' in ${DB_FLAVOR} configuration file ${file}" + # Check if the configuration exists in the file + for section in "${sections[@]}"; do + ini-file set --section "$section" --key "$key" --value "$value" "$file" + done +} + +######################## +# Update MySQL/MariaDB configuration file with user custom inputs +# Globals: +# DB_* +# Arguments: +# None +# Returns: +# None +######################### +mysql_update_custom_config() { + # Persisted configuration files from old versions + ! is_dir_empty "$DB_VOLUME_DIR" && [[ -d "$DB_VOLUME_DIR/conf" ]] && migrate_old_configuration + + # User injected custom configuration + if [[ -f "$DB_CONF_DIR/my_custom.cnf" ]]; then + debug "Injecting custom configuration from my_custom.conf" + cat "$DB_CONF_DIR/my_custom.cnf" > "$DB_CONF_DIR/bitnami/my_custom.cnf" + fi + + ! is_empty_value "$DB_USER" && mysql_conf_set "user" "$DB_USER" "mysqladmin" + ! is_empty_value "$DB_PORT_NUMBER" && mysql_conf_set "port" "$DB_PORT_NUMBER" "mysqld client manager" + ! is_empty_value "$DB_CHARACTER_SET" && mysql_conf_set "character_set_server" "$DB_CHARACTER_SET" + ! is_empty_value "$DB_COLLATE" && mysql_conf_set "collation_server" "$DB_COLLATE" + ! is_empty_value "$DB_BIND_ADDRESS" && mysql_conf_set "bind_address" "$DB_BIND_ADDRESS" + ! is_empty_value "$DB_AUTHENTICATION_PLUGIN" && mysql_conf_set "default_authentication_plugin" "$DB_AUTHENTICATION_PLUGIN" + ! is_empty_value "$DB_SQL_MODE" && mysql_conf_set "sql_mode" "$DB_SQL_MODE" + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Find the path to the libjemalloc library file +# Globals: +# None +# Arguments: +# None +# Returns: +# Path to a libjemalloc shared object file +######################### +find_jemalloc_lib() { + local -a locations=( "/usr/lib" "/usr/lib64" ) + local -r pattern='libjemalloc.so.[0-9]' + local path + for dir in "${locations[@]}"; do + # Find the first element matching the pattern and quit + [[ ! -d "$dir" ]] && continue + path="$(find "$dir" -name "$pattern" -print -quit)" + [[ -n "$path" ]] && break + done + echo "${path:-}" +} + +######################## +# Execute a reliable health check against the current mysql instance +# Globals: +# DB_ROOT_PASSWORD, DB_MASTER_ROOT_PASSWORD +# Arguments: +# None +# Returns: +# mysqladmin output +######################### +mysql_healthcheck() { + local args=("-uroot" "-h0.0.0.0") + local root_password + + root_password="$(get_master_env_var_value ROOT_PASSWORD)" + if [[ -n "$root_password" ]]; then + args+=("-p${root_password}") + fi + + mysqladmin "${args[@]}" ping && mysqladmin "${args[@]}" status +} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libowncloud.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libowncloud.sh new file mode 100644 index 000000000000..ebb52dd0cce5 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libowncloud.sh @@ -0,0 +1,446 @@ +#!/bin/bash + +# Bitnami ownCloud library + +# shellcheck disable=SC1091 +# shellcheck disable=SC2012 + +# Load generic libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/libnet.sh +. /opt/bitnami/scripts/libfile.sh +. /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libpersistence.sh +. /opt/bitnami/scripts/libwebserver.sh + +# Load database library +if [[ -f /opt/bitnami/scripts/libmysqlclient.sh ]]; then + . /opt/bitnami/scripts/libmysqlclient.sh +elif [[ -f /opt/bitnami/scripts/libmysql.sh ]]; then + . /opt/bitnami/scripts/libmysql.sh +elif [[ -f /opt/bitnami/scripts/libmariadb.sh ]]; then + . /opt/bitnami/scripts/libmariadb.sh +fi + +######################## +# Validate settings in OWNCLOUD_* env vars +# Globals: +# OWNCLOUD_* +# Arguments: +# None +# Returns: +# 0 if the validation succeeded, 1 otherwise +######################### +owncloud_validate() { + debug "Validating settings in OWNCLOUD_* environment variables" + local error_code=0 + + # Auxiliary functions + print_validation_error() { + error "$1" + error_code=1 + } + check_empty_value() { + if is_empty_value "${!1}"; then + print_validation_error "${1} must be set" + fi + } + check_yes_no_value() { + if ! is_yes_no_value "${!1}" && ! is_true_false_value "${!1}"; then + print_validation_error "The allowed values for ${1} are: yes no" + fi + } + check_multi_value() { + if [[ " ${2} " != *" ${!1} "* ]]; then + print_validation_error "The allowed values for ${1} are: ${2}" + fi + } + check_resolved_hostname() { + if ! is_hostname_resolved "$1"; then + warn "Hostname ${1} could not be resolved, this could lead to connection issues" + fi + } + check_mounted_file() { + if [[ -n "${!1:-}" ]] && ! [[ -f "${!1:-}" ]]; then + print_validation_error "${1} is defined but the file ${!1} is not accessible or does not exist" + fi + } + + # Warn users in case the configuration file is not writable + is_file_writable "$OWNCLOUD_CONF_FILE" || warn "The ownCloud configuration file '${OWNCLOUD_CONF_FILE}' is not writable. Configurations based on environment variables will not be applied for this file." + + # Validate credentials + if is_boolean_yes "$ALLOW_EMPTY_PASSWORD"; then + warn "You set the environment variable ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD}. For safety reasons, do not use this flag in a production environment." + else + for empty_env_var in "OWNCLOUD_DATABASE_PASSWORD" "OWNCLOUD_PASSWORD"; do + is_empty_value "${!empty_env_var}" && print_validation_error "The ${empty_env_var} environment variable is empty or not set. Set the environment variable ALLOW_EMPTY_PASSWORD=yes to allow a blank password. This is only recommended for development environments." + done + fi + + # Validate user inputs + check_empty_value "OWNCLOUD_HOST" + check_empty_value "OWNCLOUD_PASSWORD" + check_multi_value "OWNCLOUD_DATABASE_TYPE" "sqlite mysql" + check_yes_no_value "OWNCLOUD_SKIP_BOOTSTRAP" + + # Database configuration validations + check_resolved_hostname "$OWNCLOUD_DATABASE_HOST" + validate_port "$OWNCLOUD_DATABASE_PORT_NUMBER" + + # Validate SMTP credentials + if ! is_empty_value "$OWNCLOUD_SMTP_HOST"; then + # Not checking for empty OWNCLOUD_SMTP_USERNAME/PASSWORD because it's a supported scenario + is_empty_value "OWNCLOUD_SMTP_PORT_NUMBER" && print_validation_error "The ${empty_env_var} environment variable is empty or not set." + ! is_empty_value "$OWNCLOUD_SMTP_PROTOCOL" && check_multi_value "OWNCLOUD_SMTP_PROTOCOL" "ssl tls" + fi + + # Check that the web server is properly set up + web_server_validate || print_validation_error "Web server validation failed" + + return "$error_code" +} + +######################## +# Ensure ownCloud is initialized +# Globals: +# OWNCLOUD_* +# Arguments: +# None +# Returns: +# None +######################### +owncloud_initialize() { + # Check if ownCloud has already been initialized and persisted in a previous run + local db_type db_host db_port db_name db_user db_pass + local -r app_name="owncloud" + if ! is_app_initialized "$app_name"; then + info "Trying to connect to the database server" + db_type="$OWNCLOUD_DATABASE_TYPE" + db_host="$OWNCLOUD_DATABASE_HOST" + db_port="$OWNCLOUD_DATABASE_PORT_NUMBER" + db_name="$OWNCLOUD_DATABASE_NAME" + db_user="$OWNCLOUD_DATABASE_USER" + db_pass="$OWNCLOUD_DATABASE_PASSWORD" + [[ "$db_type" = "mysql" ]] && owncloud_wait_for_db_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + + # Ensure ownCloud persisted directories exist (i.e. when a volume has been mounted to /bitnami) + info "Ensuring ownCloud directories exist" + ensure_dir_exists "$OWNCLOUD_VOLUME_DIR" + # Use daemon:root ownership for compatibility when running as a non-root user + am_i_root && configure_permissions_ownership "$OWNCLOUD_VOLUME_DIR" -u "$WEB_SERVER_DAEMON_USER" -g "root" + + local -a owncloud_cli_args=( + "--database" "$db_type" + "--database-host" "${db_host}:${db_port}" + "--database-name" "$db_name" + "--database-user" "$db_user" + "--database-pass" "$db_pass" + "--data-dir" "$OWNCLOUD_DATA_DIR" + "--admin-user" "$OWNCLOUD_USERNAME" + "--admin-pass" "$OWNCLOUD_PASSWORD" + ) + if ! is_boolean_yes "$OWNCLOUD_SKIP_BOOTSTRAP"; then + info "Running installation script" + owncloud_execute_occ maintenance:install "${owncloud_cli_args[@]}" + # Update e-mail address of the admin user (it cannot be set via 'maintenance:install') + owncloud_execute_occ user:modify "$OWNCLOUD_USERNAME" email "$OWNCLOUD_EMAIL" + # Ensure that the web server user cannot write to the .htaccess files + configure_permissions_ownership "${OWNCLOUD_DATA_DIR}/.htaccess" -f "440" + else + info "An already initialized ownCloud database was provided, configuration will be skipped" + # ownCloud does not have any support for providing any existing database + # However, it does support SQLite as database, which is enabled by default in our ownCloud images + # Therefore we will install ownCloud with SQLite, then manually change the configuration to use the appropriate DB + info "Running installation script to create configuration (using local SQLite database)" + local data_dir + # If the data directory was not provided / is empty, populate it as if it were a new installation + if is_mounted_dir_empty "$OWNCLOUD_DATA_DIR"; then + data_dir="$OWNCLOUD_DATA_DIR" + else + data_dir="$(mktemp -d)" + # When running mktemp as 'root' it sets 700 permissions, we need more permissions + am_i_root && configure_permissions_ownership "$data_dir" -d "770" -u "$WEB_SERVER_DAEMON_USER" -g "root" + fi + owncloud_execute_occ maintenance:install "${owncloud_cli_args[@]}" --database sqlite --data-dir "$data_dir" + # Update configuration file + # These differences can be generated manually by installing with SQLite and comparing configuration files + info "Updating configuration file with values provided via environment variables" + owncloud_conf_set "mysql.utf8mb4" "true" "boolean" + owncloud_conf_set "dbhost" "${OWNCLOUD_DATABASE_HOST}:${OWNCLOUD_DATABASE_PORT_NUMBER}" + owncloud_conf_set "dbuser" "$OWNCLOUD_DATABASE_USER" + owncloud_conf_set "dbpassword" "$OWNCLOUD_DATABASE_PASSWORD" + # NOTE: These options must be last and in a *very specific order*, or 'occ config:system:set' calls will fail + # - 'dbname' will cause ownCloud not to recognize the SQLite db, failing to set any options + # - same with 'dbtableprefix', but its default value for non-SQLite dbs is 'oc_' (it's a cosmetic change) + # - Due to 'occ' not working after changing the above fields, we must manually set the DB type via a 'sed' substitution + # - 'datadirectory' stores the SQLite database, if it is changed before the DB is configured, 'occ' will fail + owncloud_conf_set "dbname" "$OWNCLOUD_DATABASE_NAME" + replace_in_file "$OWNCLOUD_CONF_FILE" "('dbtype'\s*=>\s*)'[^']*'" "\1'mysql'" + owncloud_conf_set "dbtableprefix" "oc_" + owncloud_conf_set "datadirectory" "$OWNCLOUD_DATA_DIR" + owncloud_upgrade_database_schema + fi + + # Remove wrong data directory created by the installation script to avoid confusion + rm -rf "${OWNCLOUD_BASE_DIR}/data" + + owncloud_configure_trusted_domains "${OWNCLOUD_HOST:-localhost}" + ! is_empty_value "$OWNCLOUD_SMTP_HOST" && owncloud_configure_smtp + + info "Persisting ownCloud installation" + persist_app "$app_name" "$OWNCLOUD_DATA_TO_PERSIST" + else + info "Restoring persisted ownCloud installation" + restore_persisted_app "$app_name" "$OWNCLOUD_DATA_TO_PERSIST" + info "Trying to connect to the database server" + db_type="$(owncloud_conf_get "dbtype")" + # Separate 'host:port' with native Bash split functions (fallback to default port number if not specified) + db_host_port="$(owncloud_conf_get "dbhost")" + db_host="${db_host_port%:*}" + if [[ "$db_host_port" =~ :[0-9]+$ ]]; then + # Use '##' to extract only the part after the last colon, to avoid any possible issues with IPv6 addresses + db_port="${db_host_port##*:}" + else + db_port="$OWNCLOUD_DATABASE_PORT_NUMBER" + fi + db_name="$(owncloud_conf_get "dbname")" + db_user="$(owncloud_conf_get "dbuser")" + db_pass="$(owncloud_conf_get "dbpassword")" + [[ "$db_type" = "mysql" ]] && owncloud_wait_for_db_connection "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + owncloud_upgrade_database_schema + fi + + # Regenerate .htaccess file(s) to include 'ErrorDocument 403/404' lines, not present by default + # Need to set 660 permissions in case of it already being present with 440 permissions (i.e. after a restart) + configure_permissions_ownership "${OWNCLOUD_BASE_DIR}/.htaccess" -f "660" + owncloud_execute_occ "maintenance:update:htaccess" + # Ensure that the .htaccess files cannot be written to by the web server user + configure_permissions_ownership "${OWNCLOUD_BASE_DIR}/.htaccess" -f "440" + + # Ensure ownCloud cron jobs are created when running setup with a root user + # https://doc.owncloud.com/server/admin_manual/configuration/server/background_jobs_configuration.html#cron + local cron_cmd=("${PHP_BIN_DIR}/php" "${OWNCLOUD_BASE_DIR}/occ" "system:cron") + if am_i_root; then + generate_cron_conf "owncloud" "${cron_cmd[*]}" --run-as "$WEB_SERVER_DAEMON_USER" --schedule "*/1 * * * *" + else + warn "Skipping cron configuration for ownCloud because of running as a non-root user" + fi + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Execute ownCloud command line tool "occ" printing output to stdout +# Globals: +# OWNCLOUD_* +# Arguments: +# $@ - Arguments list for occ +# Returns: +# None +######################### +owncloud_execute_occ_print_stdout() { + local args=("${@:?missing args}") + local -r cmd=("php" "${OWNCLOUD_BASE_DIR}/occ" "${args[@]}") + if am_i_root; then + gosu "$WEB_SERVER_DAEMON_USER" "${cmd[@]}" + else + "${cmd[@]}" + fi +} + +######################## +# Execute ownCloud command line tool "occ" +# Globals: +# OWNCLOUD_* +# Arguments: +# $@ - Arguments list for occ +# Returns: +# None +######################### +owncloud_execute_occ() { + debug_execute owncloud_execute_occ_print_stdout "$@" +} + +######################## +# Set a configuration parameter on the ownCloud configuration +# Globals: +# OWNCLOUD_* +# Arguments: +# $1 - Configuration parameter to set +# $2 - Value to assign to the configuration parameter +# Returns: +# None +######################### +owncloud_conf_set() { + local -r key="${1:?key missing}" + local -r value="${2:-}" + local -r type="${3:-}" + local -a args=("config:system:set" "$key" "--value" "$value") + [[ -n "$type" ]] && args+=("--type" "$type") + debug "Setting key ${key} to '${value}' in ownCloud configuration" + owncloud_execute_occ "${args[@]}" +} + +######################## +# Get an entry from the ownCloud configuration +# Globals: +# OWNCLOUD_* +# Arguments: +# $1 - configuration parameter name +# Returns: +# None +######################### +owncloud_conf_get() { + local -r key="${1:?key missing}" + # This function is only being used to obtain database credentials + # But unfortunately, when the DB is not accessible, OCC fails so we have cannot make use of it + debug "Getting ${key} from ownCloud configuration" + # Sanitize key (sed does not support fixed string substitutions) + local sanitized_pattern + sanitized_pattern="^\s*(//\s*)?['\"]?$(sed 's/[]\[^$.*/]/\\&/g' <<< "$key")['\"]?\s*=>?([^;,]+)[;,]" + debug "$sanitized_pattern" + grep -E "$sanitized_pattern" "$OWNCLOUD_CONF_FILE" | sed -E "s|${sanitized_pattern}|\2|" | tr -d "\"' " +} + +######################## +# Upgrade database schema based on user inputs using the ownCloud CLI +# Globals: +# OWNCLOUD_* +# Arguments: +# None +# Returns: +# None +######################### +owncloud_upgrade_database_schema() { + local -r next_migration="$(owncloud_execute_occ_print_stdout migrations:status core | grep "Next Version")" + + debug "Checking if database schema needs to be upgraded" + + # Upgrade database schema if we are not using at the latest migration. + if [[ ! "$next_migration" =~ "Already at latest migration step" ]]; then + info "Upgrading database schema" + # Enable maintenance mode + debug "Enabling maintenance mode" + owncloud_execute_occ maintenance:mode --on + + # Disable apps before schema upgrade + local -r app_list_file="${OWNCLOUD_BASE_DIR}/tmp/app_list" + local -r database_app_list_file="${OWNCLOUD_BASE_DIR}/tmp/database_app_list" + # Get all enabled apps + jq '.enabled | keys[]' <<< "$(owncloud_execute_occ_print_stdout app:list --no-warnings --output json)" >> "$app_list_file" + # Get database enabled apps + jq '.apps | to_entries[] | select(.value.enabled=="yes") | .key' <<< "$(owncloud_execute_occ_print_stdout config:list --no-warnings --output json)" >> "$database_app_list_file" + # Disable apps that do not exist on the new version + comm -13 "$app_list_file" "$database_app_list_file" | while read -r app; do + owncloud_execute_occ app:disable "$app" --no-warnings + done + rm -f "$app_list_file" "$database_app_list_file" + + # Get all enabled non-shipped apps + local -r non_shipped_app_list=($(jq '.enabled | keys[]' <<< "$(owncloud_execute_occ_print_stdout app:list --no-warnings --shipped=false --output json)")) + # Disable non-shipped apps before the upgrade + for app in "${non_shipped_app_list[@]}"; do + # Disable all the apps except market since we use it to update the rest + if [[ "$app" != "market" ]]; then + owncloud_execute_occ app:disable "$app" --no-warnings + fi + done + + # Perform schema upgrade + owncloud_execute_occ upgrade --no-warnings + + # Enable back non-shipped apps + for app in "${non_shipped_app_list[@]}"; do + owncloud_execute_occ app:enable "$app" --no-warnings + done + + info "Database schema upgraded correctly" + + # Disable maintenance mode + debug "Disabling maintenance mode" + owncloud_execute_occ maintenance:mode --off + else + debug "Database schema is already at latest version" + fi +} + +######################## +# Configure trusted domains using the ownCloud CLI +# Globals: +# OWNCLOUD_* +# Arguments: +# None +# Returns: +# None +######################### +owncloud_configure_trusted_domains() { + info "Configuring trusted domains" + local host="${1:?missing host}" + # We cannot use here the owncloud_conf_set because this is setting an array, not supported by the function + # Setting host #0 to 'localhost' for ownCloud CLI access via Cron jobs + owncloud_execute_occ config:system:delete trusted_domains + owncloud_execute_occ config:system:set trusted_domains 0 --value "localhost" + [[ "$host" = "localhost" ]] || owncloud_execute_occ config:system:set trusted_domains 1 --value "$host" +} + +######################## +# Configure SMTP using the ownCloud CLI +# Globals: +# OWNCLOUD_* +# Arguments: +# None +# Returns: +# None +######################### +owncloud_configure_smtp() { + info "Configuring SMTP" + owncloud_conf_set mail_domain "${OWNCLOUD_EMAIL/*@}" + owncloud_conf_set mail_from_address "${OWNCLOUD_EMAIL/@*}" + owncloud_conf_set mail_smtpmode "smtp" + owncloud_conf_set mail_smtphost "$OWNCLOUD_SMTP_HOST" + owncloud_conf_set mail_smtpport "$OWNCLOUD_SMTP_PORT_NUMBER" + if ! is_empty_value "$OWNCLOUD_SMTP_PROTOCOL"; then + owncloud_conf_set mail_smtpsecure "$OWNCLOUD_SMTP_PROTOCOL" + fi + if is_empty_value "$OWNCLOUD_SMTP_USER" && is_empty_value "$OWNCLOUD_SMTP_PASSWORD"; then + owncloud_conf_set mail_smtpauth "false" + owncloud_conf_set mail_smtpauthtype "PLAIN" + else + owncloud_conf_set mail_smtpauth "true" + owncloud_conf_set mail_smtpauthtype "LOGIN" + fi + owncloud_conf_set mail_smtpname "$OWNCLOUD_SMTP_USER" + owncloud_conf_set mail_smtppassword "$OWNCLOUD_SMTP_PASSWORD" +} + +######################## +# Wait until the database is accessible with the currently-known credentials +# Globals: +# * +# Arguments: +# $1 - database host +# $2 - database port +# $3 - database name +# $4 - database username +# $5 - database user password (optional) +# Returns: +# true if the database connection succeeded, false otherwise +######################### +owncloud_wait_for_db_connection() { + local -r db_host="${1:?missing database host}" + local -r db_port="${2:?missing database port}" + local -r db_name="${3:?missing database name}" + local -r db_user="${4:?missing database user}" + local -r db_pass="${5:-}" + check_mysql_connection() { + echo "SELECT 1" | mysql_remote_execute "$db_host" "$db_port" "$db_name" "$db_user" "$db_pass" + } + if ! retry_while "check_mysql_connection"; then + error "Could not connect to the database" + return 1 + fi +} diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libphp.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libphp.sh new file mode 100644 index 000000000000..1773eeeb1b7b --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/libphp.sh @@ -0,0 +1,238 @@ +#!/bin/bash +# +# Bitnami PHP library + +# shellcheck disable=SC1091 + +# Load Generic Libraries +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libfile.sh +. /opt/bitnami/scripts/libservice.sh +. /opt/bitnami/scripts/libvalidations.sh +. /opt/bitnami/scripts/libwebserver.sh + +######################## +# Add or modify an entry in the main PHP configuration file (php.ini) +# Globals: +# PHP_CONF_FILE +# Arguments: +# $1 - Key +# $2 - Value +# $3 - File to modify (default: $PHP_CONF_FILE) +# Returns: +# None +######################### +php_conf_set() { + local -r key="${1:?key missing}" + local -r value="${2:?value missing}" + local -r file="${3:-"$PHP_CONF_FILE"}" + local pattern="^[; ]*${key}\s*=.*$" + if [[ "$key" = "extension" || "$key" = "zend_extension" ]]; then + # The "extension" property works a bit different for PHP, as there is one per module to be included, meaning it is additive unlike other configurations + # Because of that, we first check if the extension was defined in the file to replace the proper entry + pattern="^[; ]*${key}\s*=\s*[\"]?${value}(\.so)?[\"]?\s*$" + fi + local -r entry="${key} = ${value}" + if is_file_writable "$file"; then + # Not using the ini-file tool since it does not play well with php.ini + if grep -q -E "$pattern" "$file"; then + replace_in_file "$file" "$pattern" "$entry" + else + cat >> "$file" <<< "$entry" + fi + else + warn "The PHP configuration file '${file}' is not writable. The '${key}' option will not be configured." + fi +} + +######################## +# Ensure PHP is initialized +# Globals: +# PHP_* +# Arguments: +# None +# Returns: +# None +######################### +php_initialize() { + # Configure PHP options based on the runtime environment + info "Configuring PHP options" + ! is_empty_value "$PHP_MAX_EXECUTION_TIME" && info "Setting PHP max_execution_time option" && php_conf_set max_execution_time "$PHP_MAX_EXECUTION_TIME" + ! is_empty_value "$PHP_MAX_INPUT_TIME" && info "Setting PHP max_input_time option" && php_conf_set max_input_time "$PHP_MAX_INPUT_TIME" + ! is_empty_value "$PHP_MAX_INPUT_VARS" && info "Setting PHP max_input_vars option" && php_conf_set max_input_vars "$PHP_MAX_INPUT_VARS" + ! is_empty_value "$PHP_MEMORY_LIMIT" && info "Setting PHP memory_limit option" && php_conf_set memory_limit "$PHP_MEMORY_LIMIT" + ! is_empty_value "$PHP_POST_MAX_SIZE" && info "Setting PHP post_max_size option" && php_conf_set post_max_size "$PHP_POST_MAX_SIZE" + ! is_empty_value "$PHP_UPLOAD_MAX_FILESIZE" && info "Setting PHP upload_max_filesize option" && php_conf_set upload_max_filesize "$PHP_UPLOAD_MAX_FILESIZE" + is_yes_no_value "$PHP_EXPOSE_PHP" && info "Setting PHP expose_php option" && php_conf_set expose_php "$(php_convert_to_boolean "$PHP_EXPOSE_PHP")" + + # PHP-FPM configuration + ! is_empty_value "$PHP_FPM_LISTEN_ADDRESS" && info "Setting PHP-FPM listen option" && php_conf_set "listen" "$PHP_FPM_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf" + + # Avoid exit code of previous commands to affect the result of this function + true +} + +######################## +# Convert a yes/no value to a PHP boolean +# Globals: +# None +# Arguments: +# $1 - yes/no value +# Returns: +# None +######################### +php_convert_to_boolean() { + local -r value="${1:?missing value}" + is_boolean_yes "$value" && echo "true" || echo "false" +} + +######################## +# Execute/run PHP code and print to stdout +# Globals: +# None +# Stdin: +# Code to execute +# Arguments: +# $1..$n - Input arguments to script +# Returns: +# None +######################### +php_execute_print_output() { + local php_cmd + # Obtain the command specified via stdin + php_cmd="$(/dev/null + wait + exit $? +} +trap _forwardTerm TERM + +# Start cron +if am_i_root; then + info "** Starting cron **" + if ! cron_start; then + error "Failed to start cron. Check that it is installed and its configuration is correct." + exit 1 + fi +else + warn "Cron will not be started because of running as a non-root user" +fi + +# Start Apache +if [[ -f "/opt/bitnami/scripts/nginx-php-fpm/run.sh" ]]; then + exec "/opt/bitnami/scripts/nginx-php-fpm/run.sh" +else + exec "/opt/bitnami/scripts/$(web_server_type)/run.sh" +fi diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/setup.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/setup.sh new file mode 100755 index 000000000000..cb0fa189f758 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/setup.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +# shellcheck disable=SC1090,SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load ownCloud environment +. /opt/bitnami/scripts/owncloud-env.sh + +# Load MySQL Client environment for 'mysql_remote_execute' (after 'owncloud-env.sh' so that MODULE is not set to a wrong value) +if [[ -f /opt/bitnami/scripts/mysql-client-env.sh ]]; then + . /opt/bitnami/scripts/mysql-client-env.sh +elif [[ -f /opt/bitnami/scripts/mysql-env.sh ]]; then + . /opt/bitnami/scripts/mysql-env.sh +elif [[ -f /opt/bitnami/scripts/mariadb-env.sh ]]; then + . /opt/bitnami/scripts/mariadb-env.sh +fi + +# Load PHP environment for cron configuration (after 'owncloud-env.sh' so that MODULE is not set to a wrong value) +. /opt/bitnami/scripts/php-env.sh + +# Load libraries +. /opt/bitnami/scripts/libowncloud.sh +. /opt/bitnami/scripts/libwebserver.sh + +# Load web server environment and functions (after ownCloud environment file so MODULE is not set to a wrong value) +. "/opt/bitnami/scripts/$(web_server_type)-env.sh" + +# Ensure ownCloud environment variables are valid +owncloud_validate + +# Update web server configuration with runtime environment (needs to happen before the initialization) +web_server_update_app_configuration "owncloud" + +# Ensure ownCloud is initialized +owncloud_initialize diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/updatehost.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/updatehost.sh new file mode 100755 index 000000000000..d3b28a0b0674 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/owncloud/updatehost.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +# shellcheck disable=SC1090,SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load ownCloud environment +. /opt/bitnami/scripts/owncloud-env.sh + +# Load libraries +. /opt/bitnami/scripts/libowncloud.sh +. /opt/bitnami/scripts/libfile.sh +. /opt/bitnami/scripts/libwebserver.sh + +# Load web server environment and functions (after ownCloud environment file so MODULE is not set to a wrong value) +. "/opt/bitnami/scripts/$(web_server_type)-env.sh" + +host="${1:?missing host}" + +# Update ownCloud domain for file sharing URLs to work properly +# We will not be setting 'web.baseUrl' because it only affects link sharing +owncloud_configure_trusted_domains "$host" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php-env.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php-env.sh new file mode 100644 index 000000000000..7b974fab2511 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php-env.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# +# Environment configuration for php + +# The values for all environment variables will be set in the below order of precedence +# 1. Custom environment variables defined below after Bitnami defaults +# 2. Constants defined in this file (environment variables with no default), i.e. BITNAMI_ROOT_DIR +# 3. Environment variables overridden via external files using *_FILE variables (see below) +# 4. Environment variables set externally (i.e. current Bash context/Dockerfile/userdata) + +export BITNAMI_ROOT_DIR="/opt/bitnami" +export BITNAMI_VOLUME_DIR="/bitnami" + +# Logging configuration +export MODULE="${MODULE:-php}" +export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" + +# By setting an environment variable matching *_FILE to a file path, the prefixed environment +# variable will be overridden with the value specified in that file +php_env_vars=( + PHP_FPM_LISTEN_ADDRESS + PHP_MAX_EXECUTION_TIME + PHP_MAX_INPUT_TIME + PHP_MAX_INPUT_VARS + PHP_MEMORY_LIMIT + PHP_POST_MAX_SIZE + PHP_UPLOAD_MAX_FILESIZE + PHP_EXPOSE_PHP +) +for env_var in "${php_env_vars[@]}"; do + file_env_var="${env_var}_FILE" + if [[ -n "${!file_env_var:-}" ]]; then + export "${env_var}=$(< "${!file_env_var}")" + unset "${file_env_var}" + fi +done +unset php_env_vars + +# Paths +export PHP_BASE_DIR="${BITNAMI_ROOT_DIR}/php" +export PHP_BIN_DIR="${PHP_BASE_DIR}/bin" +export PHP_CONF_DIR="${PHP_BASE_DIR}/etc" +export PHP_TMP_DIR="${PHP_BASE_DIR}/var/run" +export PHP_CONF_FILE="${PHP_CONF_DIR}/php.ini" + +# PHP default build-time configuration +export PHP_DEFAULT_OPCACHE_INTERNED_STRINGS_BUFFER="16" # only used at build time +export PHP_DEFAULT_OPCACHE_MEMORY_CONSUMPTION="192" # only used at build time +export PHP_DEFAULT_OPCACHE_FILE_CACHE="${PHP_TMP_DIR}/opcache_file" # only used at build time + +# PHP-FPM configuration +export PHP_FPM_SBIN_DIR="${PHP_BASE_DIR}/sbin" +export PHP_FPM_LOGS_DIR="${PHP_BASE_DIR}/logs" +export PHP_FPM_LOG_FILE="${PHP_FPM_LOGS_DIR}/php-fpm.log" +export PHP_FPM_CONF_FILE="${PHP_CONF_DIR}/php-fpm.conf" +export PHP_FPM_PID_FILE="${PHP_TMP_DIR}/php-fpm.pid" +export PHP_FPM_DEFAULT_LISTEN_ADDRESS="${PHP_TMP_DIR}/www.sock" # only used at build time +export PHP_FPM_LISTEN_ADDRESS="${PHP_FPM_LISTEN_ADDRESS:-}" +export PATH="${PHP_FPM_SBIN_DIR}:${PHP_BIN_DIR}:${BITNAMI_ROOT_DIR}/common/bin:${PATH}" + +# System users (when running with a privileged user) +export PHP_FPM_DAEMON_USER="daemon" +export PHP_FPM_DAEMON_GROUP="daemon" + +# PHP configuration +export PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-}" +export PHP_MAX_INPUT_TIME="${PHP_MAX_INPUT_TIME:-}" +export PHP_MAX_INPUT_VARS="${PHP_MAX_INPUT_VARS:-}" +export PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-}" +export PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-}" +export PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-}" +export PHP_EXPOSE_PHP="${PHP_EXPOSE_PHP:-yes}" + +# Custom environment variables may be defined below diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/postunpack.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/postunpack.sh new file mode 100755 index 000000000000..1a7254d7a663 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/postunpack.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libfs.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +# PHP OPcache optimizations +php_conf_set "opcache.interned_strings_buffer" "$PHP_DEFAULT_OPCACHE_INTERNED_STRINGS_BUFFER" +php_conf_set "opcache.memory_consumption" "$PHP_DEFAULT_OPCACHE_MEMORY_CONSUMPTION" +php_conf_set "opcache.file_cache" "$PHP_DEFAULT_OPCACHE_FILE_CACHE" + +# PHP-FPM configuration +php_conf_set "listen" "$PHP_FPM_DEFAULT_LISTEN_ADDRESS" "${PHP_CONF_DIR}/php-fpm.d/www.conf" + +# TMP dir configuration +php_conf_set upload_tmp_dir "$PHP_TMP_DIR" + +# Ensure directories used by PHP-FPM exist and have proper ownership and permissions +for dir in "$PHP_CONF_DIR" "$PHP_TMP_DIR" "$PHP_FPM_LOGS_DIR"; do + ensure_dir_exists "$dir" + chmod -R g+rwX "$dir" +done + +info "Disabling PHP-FPM daemon user/group configuration" +mv "${PHP_CONF_DIR}/common.conf" "${PHP_CONF_DIR}/common.conf.disabled" +touch "${PHP_CONF_DIR}/common.conf" + +ln -sf "/dev/stdout" "${PHP_FPM_LOG_FILE}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh new file mode 100755 index 000000000000..f0977ed2d47a --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/reload.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +# shellcheck disable=SC1090,SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purpose + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libwebserver.sh + +# Load PHP-FPM environment +. /opt/bitnami/scripts/php-env.sh + +# Load web server environment and functions +. "/opt/bitnami/scripts/$(web_server_type)-env.sh" + +error_code=0 + +if is_php_fpm_enabled; then + if is_php_fpm_not_running; then + error "php-fpm is not running" + error_code=1 + else + info "** Reloading PHP-FPM configuration **" + php_fpm_reload + fi +else + web_server_reload +fi + +exit "$error_code" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh new file mode 100755 index 000000000000..686174792b72 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/restart.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +/opt/bitnami/scripts/php/stop.sh +/opt/bitnami/scripts/php/start.sh diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/run.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/run.sh new file mode 100755 index 000000000000..d74d672196d4 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/run.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +info "** Starting PHP-FPM **" +declare -a args=("--pid" "$PHP_FPM_PID_FILE" "--fpm-config" "$PHP_FPM_CONF_FILE" "-c" "$PHP_CONF_DIR" "-F") +exec "${PHP_FPM_SBIN_DIR}/php-fpm" "${args[@]}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/setup.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/setup.sh new file mode 100755 index 000000000000..9238a33a5f73 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/setup.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libfs.sh +. /opt/bitnami/scripts/libos.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +# Ensure PHP-FPM daemon user exists and required folder belongs to this user when running as 'root' +if am_i_root; then + ensure_user_exists "$PHP_FPM_DAEMON_USER" "$PHP_FPM_DAEMON_GROUP" + ensure_dir_exists "$PHP_TMP_DIR" + chown -R "${PHP_FPM_DAEMON_USER}:${PHP_FPM_DAEMON_GROUP}" "$PHP_TMP_DIR" + # Enable daemon configuration + if [[ ! -f "${PHP_CONF_DIR}/common.conf" ]]; then + cp "${PHP_CONF_DIR}/common.conf.disabled" "${PHP_CONF_DIR}/common.conf" + fi +fi + +php_initialize + +# Fix logging issue when running as root +! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/start.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/start.sh new file mode 100755 index 000000000000..db62dee9997f --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/start.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +error_code=0 + +if is_php_fpm_not_running; then + nohup /opt/bitnami/scripts/php/run.sh >/dev/null 2>&1 & + if ! retry_while "is_php_fpm_running"; then + error "php-fpm did not start" + error_code=1 + else + info "php-fpm started" + fi +else + info "php-fpm is already running" +fi + +exit "${error_code}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/status.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/status.sh new file mode 100755 index 000000000000..d2f4b058ba3e --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/status.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +if is_php_fpm_running; then + info "php-fpm is already running" +else + info "php-fpm is not running" +fi diff --git a/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh new file mode 100755 index 000000000000..2b2477452469 --- /dev/null +++ b/bitnami/owncloud/10/debian-10/rootfs/opt/bitnami/scripts/php/stop.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# shellcheck disable=SC1091 + +set -o errexit +set -o nounset +set -o pipefail +# set -o xtrace # Uncomment this line for debugging purposes + +# Load libraries +. /opt/bitnami/scripts/libphp.sh +. /opt/bitnami/scripts/libos.sh +. /opt/bitnami/scripts/liblog.sh + +# Load PHP-FPM environment variables +. /opt/bitnami/scripts/php-env.sh + +error_code=0 + +if is_php_fpm_running; then + BITNAMI_QUIET=1 php_fpm_stop + if ! retry_while "is_php_fpm_not_running"; then + error "php-fpm could not be stopped" + error_code=1 + else + info "php-fpm stopped" + fi +else + info "php-fpm is not running" +fi + +exit "${error_code}" diff --git a/bitnami/owncloud/10/debian-10/rootfs/owncloud-inputs.json b/bitnami/owncloud/10/debian-10/rootfs/owncloud-inputs.json deleted file mode 100644 index 583409f0809e..000000000000 --- a/bitnami/owncloud/10/debian-10/rootfs/owncloud-inputs.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "databaseName": "{{$global.env.OWNCLOUD_DATABASE_NAME}}", - "databasePassword": "{{$global.env.OWNCLOUD_DATABASE_PASSWORD}}", - "databaseServerHost": "{{$global.env.MARIADB_HOST}}", - "databaseServerPort": "{{$global.env.MARIADB_PORT_NUMBER}}", - "databaseUser": "{{$global.env.OWNCLOUD_DATABASE_USER}}", - "email": "{{$global.env.OWNCLOUD_EMAIL}}", - "host": "{{$global.env.OWNCLOUD_HOST}}", - "password": "{{$global.env.OWNCLOUD_PASSWORD}}", - "phpMemoryLimit": "{{$global.env.PHP_MEMORY_LIMIT}}", - "username": "{{$global.env.OWNCLOUD_USERNAME}}" -} \ No newline at end of file diff --git a/bitnami/owncloud/README.md b/bitnami/owncloud/README.md index 5a004da271dc..4bfe6c1e9127 100644 --- a/bitnami/owncloud/README.md +++ b/bitnami/owncloud/README.md @@ -1,12 +1,12 @@ -# What is ownCloud? +# Bitnami Docker Image for ownCloud + +## What is ownCloud? ownCloud is a file sharing server that puts the control and security of your own data back into your hands. https://owncloud.org/ -# TL;DR - -## Docker Compose +## TL;DR ```console $ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-owncloud/master/docker-compose.yml > docker-compose.yml @@ -15,7 +15,7 @@ $ docker-compose up -d You can find the default credentials and available configuration options in the [Environment Variables](#environment-variables) section. -# Why use Bitnami Images? +## Why use Bitnami Images? * Bitnami closely tracks upstream source changes and promptly publishes new versions of this image using our automated systems. * With Bitnami images the latest bug fixes and features are available as soon as possible. @@ -24,248 +24,211 @@ You can find the default credentials and available configuration options in the * All Bitnami images available in Docker Hub are signed with [Docker Content Trust (DCT)](https://docs.docker.com/engine/security/trust/content_trust/). You can use `DOCKER_CONTENT_TRUST=1` to verify the integrity of the images. * Bitnami container images are released daily with the latest distribution packages available. - > This [CVE scan report](https://quay.io/repository/bitnami/owncloud?tab=tags) contains a security report with all open CVEs. To get the list of actionable security issues, find the "latest" tag, click the vulnerability report link under the corresponding "Security scan" field and then select the "Only show fixable" filter on the next page. -# How to deploy ownCloud in Kubernetes? +## Why use a non-root container? -Deploying Bitnami applications as Helm Charts is the easiest way to get started with our applications on Kubernetes. Read more about the installation in the [Bitnami ownCloud Chart GitHub repository](https://github.com/bitnami/charts/tree/master/bitnami/owncloud). +Non-root container images add an extra layer of security and are generally recommended for production environments. However, because they run as a non-root user, privileged tasks are typically off-limits. Learn more about non-root containers [in our docs](https://docs.bitnami.com/tutorials/work-with-non-root-containers/). -Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. - -# Supported tags and respective `Dockerfile` links +## Supported tags and respective `Dockerfile` links Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/). -* [`10`, `10-debian-10`, `10.6.0`, `10.6.0-debian-10-r17`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-owncloud/blob/10.6.0-debian-10-r17/10/debian-10/Dockerfile) +* [`10`, `10-debian-10`, `10.6.0`, `10.6.0-debian-10-r18`, `latest` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-owncloud/blob/10.6.0-debian-10-r18/10/debian-10/Dockerfile) Subscribe to project updates by watching the [bitnami/owncloud GitHub repo](https://github.com/bitnami/bitnami-docker-owncloud). -# Prerequisites +## Get this image -To run this application you need Docker Engine 1.10.0. Docker Compose is recomended with a version 1.6.0 or later. +The recommended way to get the Bitnami ownCloud Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/owncloud). -## Run ownCloud with a Database Container +```console +$ docker pull bitnami/owncloud:latest +``` -Running ownCloud with a database server is the recommended way. You can either use docker-compose or run the containers manually. +To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/owncloud/tags/) in the Docker Hub Registry. + +```console +$ docker pull bitnami/owncloud:[TAG] +``` + +If you wish, you can also build the image yourself. + +```console +$ docker build -t bitnami/owncloud:latest 'https://github.com/bitnami/bitnami-docker-owncloud.git#master:10/debian-10' +``` + +## How to use this image + +ownCloud requires access to a MySQL or MariaDB database to store information. We'll use the [Bitnami Docker Image for MariaDB](https://www.github.com/bitnami/bitnami-docker-mariadb) for the database requirements. ### Run the application using Docker Compose -This is the recommended way to run ownCloud. You can use the following docker compose template: +The main folder of this repository contains a functional [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-owncloud/blob/master/docker-compose.yml) file. Run the application using it as shown below: -```yaml -version: '2' -services: - mariadb: - image: 'bitnami/mariadb:latest' - environment: - - ALLOW_EMPTY_PASSWORD=yes - - MARIADB_USER=bn_owncloud - - MARIADB_DATABASE=bitnami_owncloud - volumes: - - 'mariadb_data:/bitnami' - owncloud: - image: 'bitnami/owncloud:latest' - environment: - - MARIADB_HOST=mariadb - - MARIADB_PORT_NUMBER=3306 - - OWNCLOUD_DATABASE_USER=bn_owncloud - - OWNCLOUD_DATABASE_NAME=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes - ports: - - '80:80' - - '443:443' - volumes: - - 'owncloud_data:/bitnami' - depends_on: - - mariadb -volumes: - mariadb_data: - driver: local - owncloud_data: - driver: local +```console +$ curl -sSL https://raw.githubusercontent.com/bitnami/bitnami-docker-owncloud/master/docker-compose.yml > docker-compose.yml +$ docker-compose up -d ``` -### Run the application manually +### Using the Docker Command Line -If you want to run the application manually instead of using docker-compose, these are the basic steps you need to run: +If you want to run the application manually instead of using `docker-compose`, these are the basic steps you need to run: -1. Create a new network for the application and the database: +#### Step 1: Create a network - ```console - $ docker network create owncloud-tier - ``` +```console +$ docker network create owncloud-network +``` -2. Create a volume for MariaDB persistence and create a MariaDB container +#### Step 2: Create a volume for MariaDB persistence and create a MariaDB container - ```console - $ docker volume create --name mariadb_data - $ docker run -d --name mariadb \ - -e ALLOW_EMPTY_PASSWORD=yes \ - -e MARIADB_USER=bn_owncloud \ - -e MARIADB_DATABASE=bitnami_owncloud \ - --net owncloud-tier \ - --volume mariadb_data:/bitnami \ - bitnami/mariadb:latest - ``` +```console +$ docker volume create --name mariadb_data +$ docker run -d --name mariadb \ + --env ALLOW_EMPTY_PASSWORD=yes \ + --env MARIADB_USER=bn_owncloud \ + --env MARIADB_PASSWORD=bitnami \ + --env MARIADB_DATABASE=bitnami_owncloud \ + --network owncloud-network \ + --volume mariadb_data:/bitnami/mariadb \ + bitnami/mariadb:latest +``` - *Note:* You need to give the container a name in order to OwnCloud to resolve the host +#### Step 3: Create volumes for ownCloud persistence and launch the container -3. Create volumes for Owncloud persistence and launch the container +```console +$ docker volume create --name owncloud_data +$ docker run -d --name owncloud \ + -p 8080:8080 -p 8443:8443 \ + --env ALLOW_EMPTY_PASSWORD=yes \ + --env OWNCLOUD_DATABASE_USER=bn_owncloud \ + --env OWNCLOUD_DATABASE_PASSWORD=bitnami \ + --env OWNCLOUD_DATABASE_NAME=bitnami_owncloud \ + --network owncloud-network \ + --volume owncloud_data:/bitnami/owncloud \ + bitnami/owncloud:latest +``` - ```console - $ docker volume create --name owncloud_data - $ docker run -d --name owncloud -p 80:80 -p 443:443 \ - -e ALLOW_EMPTY_PASSWORD=yes \ - -e OWNCLOUD_DATABASE_USER=bn_owncloud \ - -e OWNCLOUD_DATABASE_NAME=bitnami_owncloud \ - --net owncloud-tier \ - --volume owncloud_data:/bitnami \ - bitnami/owncloud:latest - ``` - -Then you can access your application at http://your-ip/ - -> *Note:* If you want to access your application from a public IP or hostname you need to configure as a Trusted Domain. You can handle it adjusting the configuration of the instance by setting the environment variable "OWNCLOUD_HOST" to your public IP or hostname. - -> *Note:* If you persisted your application and you already run your container, you won't be able to configure the Trusted Domains using the previous environment variable. Trusted Domains will be set using the configuration that had been previously persisted. Therefore, you will need to connect you container and execute the command below: - - ````console - $ sudo -u daemon /opt/bitnami/php/bin/php /opt/bitnami/owncloud/occ config:system:set trusted_domains 2 --value=YOUR_HOSTNAME - ```` +Access your application at *http://your-ip/* ## Persisting your application -If you remove the container all your data and configurations will be lost, and the next time you run the image the database will be reinitialized. To avoid this loss of data, you should mount a volume that will persist even after the container is removed. +If you remove the container all your data will be lost, and the next time you run the image the database will be reinitialized. To avoid this loss of data, you should mount a volume that will persist even after the container is removed. -For persistence you should mount a volume at the `/bitnami` path. Additionally you should mount a volume for [persistence of the MariaDB data](https://github.com/bitnami/bitnami-docker-mariadb#persisting-your-database). +For persistence you should mount a directory at the `/bitnami/owncloud` path. If the mounted directory is empty, it will be initialized on the first run. Additionally you should mount a volume for persistence of the MariaDB data](https://github.com/bitnami/bitnami-docker-mariadb#persisting-your-database). -The above examples define docker volumes namely `mariadb_data` and `owncloud_data`. The ownCloud application state will persist as long as these volumes are not removed. +The above examples define the Docker volumes named `mariadb_data` and `owncloud_data`. The ownCloud application state will persist as long as volumes are not removed. -To avoid inadvertent removal of these volumes you can [mount host directories as data volumes](https://docs.docker.com/engine/tutorials/dockervolumes/). Alternatively you can make use of volume plugins to host the volume data. +To avoid inadvertent removal of volumes, you can [mount host directories as data volumes](https://docs.docker.com/engine/tutorials/dockervolumes/). Alternatively you can make use of volume plugins to host the volume data. -### Mount persistent folders in the host using docker-compose +### Mount host directories as data volumes with Docker Compose -This requires a minor change to the `docker-compose.yml` template previously shown: +This requires a minor change to the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-owncloud/blob/master/docker-compose.yml) file present in this repository: -```yaml -version: '2' - -services: - mariadb: - image: 'bitnami/mariadb:latest' - environment: - - ALLOW_EMPTY_PASSWORD=yes - - MARIADB_USER=bn_owncloud - - MARIADB_DATABASE=bitnami_owncloud - volumes: - - '/path/to/mariadb-persistence:/bitnami' - owncloud: - image: 'bitnami/owncloud:latest' - environment: - - OWNCLOUD_DATABASE_USER=bn_owncloud - - OWNCLOUD_DATABASE_NAME=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes - depends_on: - - mariadb - ports: - - '80:80' - - '443:443' - volumes: - - '/path/to/owncloud-persistence:/bitnami' +```diff + mariadb: + ... + volumes: +- - 'mariadb_data:/bitnami/mariadb' ++ - /path/to/mariadb-persistence:/bitnami/mariadb + ... + owncloud: + ... + volumes: +- - 'owncloud_data:/bitnami/owncloud' ++ - /path/to/owncloud-persistence:/bitnami/owncloud + ... +-volumes: +- mariadb_data: +- driver: local +- owncloud_data: +- driver: local ``` +> NOTE: As this is a non-root container, the mounted files and directories must have the proper permissions for the UID `1001`. + ### Mount host directories as data volumes using the Docker command line -In this case you need to specify the directories to mount on the run command. The process is the same than the one previously shown: +#### Step 1: Create a network (if it does not exist) -1. Create a network (if it does not exist): +```console +$ docker network create owncloud-network +``` + +#### Step 2. Create a MariaDB container with host volume + +```console +$ docker volume create --name mariadb_data +$ docker run -d --name mariadb \ + --env ALLOW_EMPTY_PASSWORD=yes \ + --env MARIADB_USER=bn_owncloud \ + --env MARIADB_PASSWORD=bitnami \ + --env MARIADB_DATABASE=bitnami_owncloud \ + --network owncloud-network \ + --volume /path/to/mariadb-persistence:/bitnami/mariadb \ + bitnami/mariadb:latest +``` + +#### Step 3. Create the ownCloud the container with host volumes + +```console +$ docker volume create --name owncloud_data +$ docker run -d --name owncloud \ + -p 8080:8080 -p 8443:8443 \ + --env ALLOW_EMPTY_PASSWORD=yes \ + --env OWNCLOUD_DATABASE_USER=bn_owncloud \ + --env OWNCLOUD_DATABASE_PASSWORD=bitnami \ + --env OWNCLOUD_DATABASE_NAME=bitnami_owncloud \ + --network owncloud-network \ + --volume /path/to/owncloud-persistence:/bitnami/owncloud \ + bitnami/owncloud:latest +``` + +## Configuration + +## Environment variables + +When you start the ownCloud image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. If you want to add a new environment variable: + + * For docker-compose add the variable name and value under the application section in the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-owncloud/blob/master/docker-compose.yml) file present in this repository: + +```yaml +owncloud: + ... + environment: + - OWNCLOUD_PASSWORD=my_password + ... +``` + + * For manual execution add a `--env` option with each variable and value: ```console - $ docker network create owncloud-tier - ``` - -2. Create a MariaDB container with host volume: - - ```console - $ docker run -d --name mariadb \ - -e ALLOW_EMPTY_PASSWORD=yes \ - -e MARIADB_USER=bn_owncloud \ - -e MARIADB_DATABASE=bitnami_owncloud \ - --net owncloud-tier \ - --volume /path/to/mariadb-persistence:/bitnami \ - bitnami/mariadb:latest - ``` - - *Note:* You need to give the container a name in order to OwnCloud to resolve the host - -3. Create the ownCloud container with host volumes: - - ```console - $ docker run -d --name owncloud -p 80:80 -p 443:443 \ - -e ALLOW_EMPTY_PASSWORD=yes \ - -e OWNCLOUD_DATABASE_USER=bn_owncloud \ - -e OWNCLOUD_DATABASE_NAME=bitnami_owncloud \ - --net owncloud-tier \ + $ docker run -d --name owncloud -p 80:8080 -p 443:8443 \ + --env OWNCLOUD_PASSWORD=my_password \ + --network owncloud-tier \ --volume /path/to/owncloud-persistence:/bitnami \ bitnami/owncloud:latest ``` -# Upgrade this application - -Bitnami provides up-to-date versions of MariaDB and OwnCloud, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the OwnCloud container. For the MariaDB upgrade see https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#upgrade-this-image - -1. Get the updated images: - - ```console - $ docker pull bitnami/owncloud:latest - ``` - -2. Stop your container - - * For docker-compose: `$ docker-compose stop owncloud` - * For manual execution: `$ docker stop owncloud` - -3. Take a snapshot of the application state - -```console -$ rsync -a /path/to/owncloud-persistence /path/to/owncloud-persistence.bkp.$(date +%Y%m%d-%H.%M.%S) -``` - -Additionally, [snapshot the MariaDB data](https://github.com/bitnami/bitnami-docker-mariadb#step-2-stop-and-backup-the-currently-running-container) - -You can use these snapshots to restore the application state should the upgrade fail. - -4. Remove the currently running container - - * For docker-compose: `$ docker-compose rm -v owncloud` - * For manual execution: `$ docker rm -v owncloud` - -5. Run the new image - - * For docker-compose: `$ docker-compose up owncloud` - * For manual execution ([mount](#mount-persistent-folders-manually) the directories if needed): `docker run --name owncloud bitnami/owncloud:latest` - -# Configuration - -## Environment variables - -When you start the owncloud image, you can adjust the configuration of the instance by passing one or more environment variables either on the docker-compose file or on the `docker run` command line. +Available environment variables: ##### User and Site configuration - - `APACHE_HTTP_PORT_NUMBER`: Port used by Apache for HTTP. Default: **80** - - `APACHE_HTTPS_PORT_NUMBER`: Port used by Apache for HTTPS. Default: **443** - - `OWNCLOUD_USERNAME`: Owncloud application username. Default: **user** - - `OWNCLOUD_PASSWORD`: Owncloud application password. Default: **bitnami** - - `OWNCLOUD_EMAIL`: Owncloud application email. Default: **user@example.com** - - `OWNCLOUD_HOST`: Owncloud Host Server. +- `APACHE_HTTP_PORT_NUMBER`: Port used by Apache for HTTP. Default: **8080** +- `APACHE_HTTPS_PORT_NUMBER`: Port used by Apache for HTTPS. Default: **8443** +- `OWNCLOUD_USERNAME`: ownCloud application username. Default: **user** +- `OWNCLOUD_PASSWORD`: ownCloud application password. Default: **bitnami** +- `OWNCLOUD_EMAIL`: ownCloud application email. Default: **user@example.com** +- `OWNCLOUD_SKIP_BOOTSTRAP`: Whether to perform initial bootstrapping for the application. Default: **no** +- `OWNCLOUD_HOST`: ownCloud host to configure internal paths. Default: **set to the machine ip** ##### Use an existing database -- `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb** -- `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** +- `OWNCLOUD_DATABASE_TYPE`: Database type to use. Valid values: mysql, sqlite. Default: **mysql** +- `OWNCLOUD_DATABASE_HOST`: Hostname for MariaDB server. Default: **mariadb** +- `OWNCLOUD_DATABASE_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** - `OWNCLOUD_DATABASE_NAME`: Database name that ownCloud will use to connect with the database. Default: **bitnami_owncloud** - `OWNCLOUD_DATABASE_USER`: Database user that ownCloud will use to connect with the database. Default: **bn_owncloud** - `OWNCLOUD_DATABASE_PASSWORD`: Database password that ownCloud will use to connect with the database. No defaults. @@ -273,50 +236,180 @@ When you start the owncloud image, you can adjust the configuration of the insta ##### Create a database for ownCloud using mysql-client -- `MARIADB_HOST`: Hostname for MariaDB server. Default: **mariadb** -- `MARIADB_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** -- `MARIADB_ROOT_USER`: Database admin user. Default: **root** -- `MARIADB_ROOT_PASSWORD`: Database password for the `MARIADB_ROOT_USER` user. No defaults. +- `MYSQL_CLIENT_DATABASE_HOST`: Hostname for MariaDB server. Default: **mariadb** +- `MYSQL_CLIENT_DATABASE_PORT_NUMBER`: Port used by MariaDB server. Default: **3306** +- `MYSQL_CLIENT_DATABASE_ROOT_USER`: Database admin user. Default: **root** +- `MYSQL_CLIENT_DATABASE_ROOT_PASSWORD`: Database password for the database admin user. No defaults. - `MYSQL_CLIENT_CREATE_DATABASE_NAME`: New database to be created by the mysql client module. No defaults. - `MYSQL_CLIENT_CREATE_DATABASE_USER`: New database user to be created by the mysql client module. No defaults. - `MYSQL_CLIENT_CREATE_DATABASE_PASSWORD`: Database password for the `MYSQL_CLIENT_CREATE_DATABASE_USER` user. No defaults. +- `MYSQL_CLIENT_CREATE_DATABASE_CHARACTER_SET`: Character set to use for the new database. No defaults. +- `MYSQL_CLIENT_CREATE_DATABASE_COLLATE`: Database collation to use for the new database. No defaults. - `ALLOW_EMPTY_PASSWORD`: It can be used to allow blank passwords. Default: **no** +##### SMTP Configuration + +To configure ownCloud to send email using SMTP you can set the following environment variables: + +- `OWNCLOUD_SMTP_HOST`: SMTP host. +- `OWNCLOUD_SMTP_PORT_NUMBER`: SMTP port. +- `OWNCLOUD_SMTP_USER`: SMTP account user. +- `OWNCLOUD_SMTP_PASSWORD`: SMTP account password. +- `SUITECRM_SMTP_PROTOCOL`: SMTP protocol to use. + ##### PHP configuration +- `PHP_MAX_EXECUTION_TIME`: Maximum execution time for PHP scripts. No default. +- `PHP_MAX_INPUT_TIME`: Maximum input time for PHP scripts. No default. +- `PHP_MAX_INPUT_VARS`: Maximum amount of input variables for PHP scripts. No default. - `PHP_MEMORY_LIMIT`: Memory limit for PHP scripts. Default: **512M** +- `PHP_POST_MAX_SIZE`: Maximum size for PHP POST requests. Default: **2G** +- `PHP_UPLOAD_MAX_FILESIZE`: Maximum file size for PHP uploads. Default: **2G** -If you want to add a new environment variable: +##### Example - * For docker-compose add the variable name and value under the application section: +This would be an example of SMTP configuration using a Gmail account: + + * Modify the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-owncloud/blob/master/docker-compose.yml) file present in this repository: ```yaml -owncloud: - image: bitnami/owncloud:latest - ports: - - 80:80 - - 443:443 - environment: - - OWNCLOUD_HOST=your_host - volumes: - - owncloud_data:/bitnami + owncloud: + ... + environment: + - OWNCLOUD_DATABASE_USER=bn_owncloud + - OWNCLOUD_DATABASE_NAME=bitnami_owncloud + - ALLOW_EMPTY_PASSWORD=yes + - OWNCLOUD_SMTP_HOST=smtp.gmail.com + - OWNCLOUD_SMTP_PORT=587 + - OWNCLOUD_SMTP_USER=your_email@gmail.com + - OWNCLOUD_SMTP_PASSWORD=your_password + ... ``` - - * For manual execution add a `-e` option with each variable and value: + * For manual execution: ```console - $ docker run -d --name owncloud -p 80:80 -p 443:443 \ - -e OWNCLOUD_PASSWORD=my_password \ - --net owncloud-tier \ + $ docker run -d --name owncloud -p 80:8080 -p 443:8443 \ + --env OWNCLOUD_DATABASE_USER=bn_owncloud \ + --env OWNCLOUD_DATABASE_NAME=bitnami_owncloud \ + --env OWNCLOUD_SMTP_HOST=smtp.gmail.com \ + --env OWNCLOUD_SMTP_PORT=587 \ + --env OWNCLOUD_SMTP_USER=your_email@gmail.com \ + --env OWNCLOUD_SMTP_PASSWORD=your_password \ + --network owncloud-tier \ --volume /path/to/owncloud-persistence:/bitnami \ bitnami/owncloud:latest ``` -# Customize this image +## Logging + +The Bitnami ownCloud Docker image sends the container logs to `stdout`. To view the logs: + +```console +$ docker logs owncloud +``` + +Or using Docker Compose: + +```console +$ docker-compose logs owncloud +``` + +You can configure the containers [logging driver](https://docs.docker.com/engine/admin/logging/overview/) using the `--log-driver` option if you wish to consume the container logs differently. In the default configuration docker uses the `json-file` driver. + +## Maintenance + +### Backing up your container + +To backup your data, configuration and logs, follow these simple steps: + +#### Step 1: Stop the currently running container + +```console +$ docker stop owncloud +``` + +Or using Docker Compose: + +```console +$ docker-compose stop owncloud +``` + +#### Step 2: Run the backup command + +We need to mount two volumes in a container we will use to create the backup: a directory on your host to store the backup in, and the volumes from the container we just stopped so we can access the data. + +```console +$ docker run --rm -v /path/to/owncloud-backups:/backups --volumes-from owncloud busybox \ + cp -a /bitnami/owncloud /backups/latest +``` + +### Restoring a backup + +Restoring a backup is as simple as mounting the backup as volumes in the containers. + +For the MariaDB database container: + +```diff + $ docker run -d --name mariadb \ + ... +- --volume /path/to/mariadb-persistence:/bitnami/mariadb \ ++ --volume /path/to/mariadb-backups/latest:/bitnami/mariadb \ + bitnami/mariadb:latest +``` + +For the ownCloud container: + +```diff + $ docker run -d --name owncloud \ + ... +- --volume /path/to/owncloud-persistence:/bitnami/owncloud \ ++ --volume /path/to/owncloud-backups/latest:/bitnami/owncloud \ + bitnami/owncloud:latest +``` + +### Upgrade this image + +Bitnami provides up-to-date versions of MariaDB and ownCloud, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container. We will cover here the upgrade of the ownCloud container. For the MariaDB upgrade see: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#upgrade-this-image + +#### Step 1: Get the updated image + +```console +$ docker pull bitnami/owncloud:latest +``` + +#### Step 2: Stop the running container + +Stop the currently running container using the command + +```console +$ docker-compose stop owncloud +``` + +#### Step 3: Take a snapshot of the application state + +Follow the steps in [Backing up your container](#backing-up-your-container) to take a snapshot of the current application state. + +#### Step 4: Remove the currently running container + +Remove the currently running container by executing the following command: + +```console +docker-compose rm -v owncloud +``` + +#### Step 5: Run the new image + +Update the image tag in `docker-compose.yml` and re-create your container with the new image: + +```console +$ docker-compose up -d +``` + +## Customize this image The Bitnami ownCloud Docker image is designed to be extended so it can be used as the base image for your custom web applications. -## Extend this image +### Extend this image Before extending this image, please note there are certain configuration settings you can modify using the original image: @@ -343,8 +436,12 @@ Here is an example of extending the image with the following modifications: FROM bitnami/owncloud LABEL maintainer "Bitnami " +## Change user to perform privileged actions +USER 0 ## Install 'vim' RUN install_packages vim +## Revert to the original non-root user +USER 1001 ## Enable mod_ratelimit module RUN sed -i -r 's/#LoadModule ratelimit_module/LoadModule ratelimit_module/' /opt/bitnami/apache/conf/httpd.conf @@ -356,46 +453,46 @@ ENV APACHE_HTTPS_PORT_NUMBER=8143 EXPOSE 8181 8143 ``` -Based on the extended image, you can use a Docker Compose file like the one below to add other features: +Based on the extended image, you can update the [`docker-compose.yml`](https://github.com/bitnami/bitnami-docker-owncloud/blob/master/docker-compose.yml) file present in this repository to add other features: -```yaml -version: '2' -services: - mariadb: - image: 'bitnami/mariadb:10.1' - environment: - - MARIADB_USER=bn_owncloud - - MARIADB_DATABASE=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes - volumes: - - 'mariadb_data:/bitnami' - owncloud: - build: . - environment: - - MARIADB_HOST=mariadb - - MARIADB_PORT_NUMBER=3306 - - OWNCLOUD_DATABASE_USER=bn_owncloud - - OWNCLOUD_DATABASE_NAME=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes - # Host for accessing OwnCloud - # note: this setting will only be applied on the first run - # ref: https://github.com/bitnami/bitnami-docker-owncloud#configuration - - OWNCLOUD_HOST=localhost - ports: - - '80:8181' - - '443:8143' - volumes: - - 'owncloud_data:/bitnami' - depends_on: - - mariadb -volumes: - mariadb_data: - driver: local - owncloud_data: - driver: local +```diff + owncloud: +- image: bitnami/owncloud:latest ++ build: . + ports: +- - '80:8080' +- - '443:8443' ++ - '80:8181' ++ - '443:8143' + environment: ++ - PHP_MEMORY_LIMIT=512m + ... ``` -# Notable Changes +## Notable Changes + +## Notable Changes + +## 10.6.0-debian-10-r18 + +- The size of the container image has been decreased. +- The configuration logic is now based on Bash scripts in the *rootfs/* folder. +- The ownCloud container now supports the "non-root" user approach, but it still runs as the root user by default. When running as a non-root user, all services will be run under the same user and Cron jobs will be disabled as crond requires to be run as a superuser. To run as a non-root user, change USER root to USER 1001 in the Dockerfile, or use user: 1001 in docker-compose.yml. Related changes: + - The HTTP/HTTPS ports exposed by the container are now `8080/8443` instead of `80/443`. + - Backwards compatibility is not guaranteed when data is persisted using docker or docker-compose. We highly recommend migrating the ownCloud site by exporting its content, and importing it on a new ownCloud container. Follow the steps in [Backing up your container](#backing-up-your-container) and [Restoring a backup](#restoring-a-backup) to migrate the data between the old and new container. + +To upgrade a deployment with the previous Bitnami SuiteCRM container image, which did not support non-root, the easiest way is to start the new image as a *root* user and updating the port numbers. Modify your `docker-compose.yml` file as follows: + +```diff + - OWNCLOUD_HOST=localhost ++ user: root + ports: +- - '80:80' +- - '443:443' ++ - '80:8080' ++ - '443:8443' + volumes: +``` ## 10.2.0-debian-9-r8 and 10.2.0-ol-7-r8 @@ -404,27 +501,29 @@ volumes: - The PHP configuration volume (`/bitnami/php`) has been deprecated, and support for this feature will be dropped in the near future. Until then, the container will enable the PHP configuration from that volume if it exists. By default, and if the configuration volume does not exist, the configuration files will be regenerated each time the container is created. Users wanting to apply custom PHP configuration files are advised to mount a volume for the configuration at `/opt/bitnami/php/conf`, or mount specific configuration files individually. - Enabling custom Apache certificates by placing them at `/opt/bitnami/apache/certs` has been deprecated, and support for this functionality will be dropped in the near future. Users wanting to enable custom certificates are advised to mount their certificate files on top of the preconfigured ones at `/certs`. -# Contributing +## Contributing We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-owncloud/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-owncloud/pulls) with your contribution. -# Issues +## Issues + +If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-owncloud/issues). For us to provide better support, be sure to include the following information in your issue: - Host OS and version - Docker version (`docker version`) - Output of `docker info` -- Version of this container (`echo $BITNAMI_IMAGE_VERSION` inside the container) +- Version of this container - The command you used to run the container, and any relevant output you saw (masking any sensitive information) -# License +## License -Copyright 2016-2021 Bitnami +Copyright (c) 2021 Bitnami Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, diff --git a/bitnami/owncloud/docker-compose.yml b/bitnami/owncloud/docker-compose.yml index 2f657a75a98d..ffb47aa84f3c 100644 --- a/bitnami/owncloud/docker-compose.yml +++ b/bitnami/owncloud/docker-compose.yml @@ -3,28 +3,28 @@ services: mariadb: image: 'docker.io/bitnami/mariadb:10.3-debian-10' environment: + - ALLOW_EMPTY_PASSWORD=yes - MARIADB_USER=bn_owncloud - MARIADB_DATABASE=bitnami_owncloud - - ALLOW_EMPTY_PASSWORD=yes volumes: - - 'mariadb_data:/bitnami' + - 'mariadb_data:/bitnami/mariadb' owncloud: image: 'docker.io/bitnami/owncloud:10-debian-10' + ports: + - '80:8080' + - '443:8443' environment: - - MARIADB_HOST=mariadb - - MARIADB_PORT_NUMBER=3306 + - OWNCLOUD_DATABASE_HOST=mariadb + - OWNCLOUD_DATABASE_PORT_NUMBER=3306 - OWNCLOUD_DATABASE_USER=bn_owncloud - OWNCLOUD_DATABASE_NAME=bitnami_owncloud - ALLOW_EMPTY_PASSWORD=yes - # Host for accessing OwnCloud + # Host for accessing ownCloud # note: this setting will only be applied on the first run # ref: https://github.com/bitnami/bitnami-docker-owncloud#configuration - OWNCLOUD_HOST=localhost - ports: - - '80:80' - - '443:443' volumes: - - 'owncloud_data:/bitnami' + - 'owncloud_data:/bitnami/owncloud' depends_on: - mariadb volumes: