Skip to content

Commit b1de996

Browse files
committed
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>
1 parent d784a6a commit b1de996

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

build/docker/lamp/010lamp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ set -e
1616
}
1717

1818
# MOVE CONFIGS TO PERSISTENT VOLUME
19-
persistent_cfg /etc/apache2
19+
persistent_cfg /etc/apache2/sites-available /data/etc/apache2/sites-available
20+
persistent_cfg /etc/apache2/sites-enabled /data/etc/apache2/sites-enabled
2021

2122
# Run hardcoded hooks. This allows scripts in the image to change persistent values before
2223
# initialization. Use case is to download a new image.

build/docker/nextcloudpi/000ncp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ source /usr/local/etc/library.sh
44

55
# INIT NCP CONFIG (first run)
66
persistent_cfg /usr/local/etc/ncp-config.d /data/ncp
7-
persistent_cfg /etc/services-enabled.d
87
persistent_cfg /etc/letsencrypt # persist SSL certificates
98
persistent_cfg /etc/shadow # persist ncp-web password
109
persistent_cfg /etc/cron.d
@@ -22,4 +21,7 @@ persistent_cfg /etc/cron.weekly
2221
}
2322
persistent_cfg /usr/local/bin /data/bin
2423

24+
touch /var/log/ncp.log
25+
tail -f -n0 /data/nextcloud/data/nextcloud.log &
26+
2527
exit 0

0 commit comments

Comments
 (0)