diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-28 13:20:08 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-09-28 13:20:08 +0300 |
| commit | b1de996809b48250b045e49fd41d2df828e28bb5 (patch) | |
| tree | 3f5404c1cb644dfbb202dc083eb7bb702c7703de | |
| parent | d784a6a932977fc2b2a04eceeaa1803c8e159dea (diff) | |
000ncp: Don't make /etc/services-enabled.d persistent
000ncp: Show ncp.log in docker output
010lamp: Only persist apache sites config, not apache config
Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
| -rwxr-xr-x | build/docker/lamp/010lamp | 3 | ||||
| -rwxr-xr-x | build/docker/nextcloudpi/000ncp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/docker/lamp/010lamp b/build/docker/lamp/010lamp index 5139c01c..cf192882 100755 --- a/build/docker/lamp/010lamp +++ b/build/docker/lamp/010lamp @@ -16,7 +16,8 @@ set -e } # MOVE CONFIGS TO PERSISTENT VOLUME -persistent_cfg /etc/apache2 +persistent_cfg /etc/apache2/sites-available /data/etc/apache2/sites-available +persistent_cfg /etc/apache2/sites-enabled /data/etc/apache2/sites-enabled # Run hardcoded hooks. This allows scripts in the image to change persistent values before # initialization. Use case is to download a new image. diff --git a/build/docker/nextcloudpi/000ncp b/build/docker/nextcloudpi/000ncp index 820eb8cf..ac098351 100755 --- a/build/docker/nextcloudpi/000ncp +++ b/build/docker/nextcloudpi/000ncp @@ -4,7 +4,6 @@ source /usr/local/etc/library.sh # INIT NCP CONFIG (first run) persistent_cfg /usr/local/etc/ncp-config.d /data/ncp -persistent_cfg /etc/services-enabled.d persistent_cfg /etc/letsencrypt # persist SSL certificates persistent_cfg /etc/shadow # persist ncp-web password persistent_cfg /etc/cron.d @@ -22,4 +21,7 @@ persistent_cfg /etc/cron.weekly } persistent_cfg /usr/local/bin /data/bin +touch /var/log/ncp.log +tail -f -n0 /data/nextcloud/data/nextcloud.log & + exit 0 |