diff --git a/dhcp-config/files/dhclient-enter-hooks b/dhcp-config/files/dhclient-enter-hooks index 27388e9..b302f85 100644 --- a/dhcp-config/files/dhclient-enter-hooks +++ b/dhcp-config/files/dhclient-enter-hooks @@ -17,7 +17,7 @@ source /etc/platform/platform.conf if [ -n "$wrs_install_uuid" ]; then if [ "$nodetype" == "controller" ]; then source /etc/build.info - file="/www/pages/feed/rel-$SW_VERSION/install_uuid" + file="/var/www/pages/feed/rel-$SW_VERSION/install_uuid" INSTALL_UUID=$(cat "$file") fi if [ "$INSTALL_UUID" != "$wrs_install_uuid" ]; then diff --git a/lighttpd-config/centos/lighttpd-config.spec b/lighttpd-config/centos/lighttpd-config.spec index ff1268c..41b70ea 100644 --- a/lighttpd-config/centos/lighttpd-config.spec +++ b/lighttpd-config/centos/lighttpd-config.spec @@ -30,7 +30,7 @@ StarlingX lighttpd configuration file %install CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd -ROOTDIR=%{buildroot}/www +ROOTDIR=%{buildroot}/var/www install -d -m 1777 ${ROOTDIR}/tmp install -d ${CONFDIR}/ssl @@ -67,7 +67,7 @@ fi %{_datadir}/starlingx/lighttpd.conf %{_datadir}/starlingx/lighttpd.logrotate %{_datadir}/starlingx/lighttpd.init -%dir /www/pages/ -/www/pages/* +%dir /var/www/pages/ +/var/www/pages/* %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd-inc.conf -/www/pages/index.html +/var/www/pages/index.html diff --git a/lighttpd-config/files/lighttpd.conf b/lighttpd-config/files/lighttpd.conf index af4d039..d44f313 100755 --- a/lighttpd-config/files/lighttpd.conf +++ b/lighttpd-config/files/lighttpd.conf @@ -39,7 +39,7 @@ server.modules = ( ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options -server.document-root = "/www/pages/" +server.document-root = "/var/www/pages/" ## where to send error-messages to server.errorlog = "/var/log/lighttpd-error.log" diff --git a/lighttpd-config/files/lighttpd.init b/lighttpd-config/files/lighttpd.init index 3d347e5..ae57780 100755 --- a/lighttpd-config/files/lighttpd.init +++ b/lighttpd-config/files/lighttpd.init @@ -54,11 +54,11 @@ start() done echo -n "Mounting scratch filesystem to chroot tmp..." - umount /www/tmp >& /dev/null + umount /var/www/tmp >& /dev/null rm -r /scratch/lighttpd >& /dev/null mkdir -p /scratch/lighttpd - mount --bind /scratch/lighttpd /www/tmp/ - chown www /www/tmp/ + mount --bind /scratch/lighttpd /var/www/tmp/ + chown www /var/www/tmp/ echo -n "Starting $DESC..." @@ -86,7 +86,7 @@ stop() fi rm -f $PIDFILE echo -n "Unmounting scratch filesystem from chroot tmp..." - umount /www/tmp + umount /var/www/tmp } status() diff --git a/lighttpd-config/files/lighttpd.logrotate b/lighttpd-config/files/lighttpd.logrotate index 5f1e87c..d942d23 100644 --- a/lighttpd-config/files/lighttpd.logrotate +++ b/lighttpd-config/files/lighttpd.logrotate @@ -1,7 +1,7 @@ /var/log/lighttpd-access.log /var/log/lighttpd-error.log -/www/var/log/lighttpd-access.log -/www/var/log/lighttpd-error.log { +/var/www/var/log/lighttpd-access.log +/var/www/var/log/lighttpd-error.log { nodateext size 10M start 1 diff --git a/rsync-config/files/rsyncd.conf b/rsync-config/files/rsyncd.conf index f7a26e1..47397b2 100644 --- a/rsync-config/files/rsyncd.conf +++ b/rsync-config/files/rsyncd.conf @@ -21,7 +21,7 @@ read only = yes read only = no [repo] - path = /www/pages/updates + path = /var/www/pages/updates comment = Patching repo uid = root read only = no @@ -51,7 +51,7 @@ read only = yes read only = no [helm_charts] - path = /www/pages/helm_charts + path = /var/www/pages/helm_charts comment = Helm chart repo uid = root read only = no diff --git a/rsync-config/source-debian/rsyncd.conf b/rsync-config/source-debian/rsyncd.conf index f7a26e1..47397b2 100644 --- a/rsync-config/source-debian/rsyncd.conf +++ b/rsync-config/source-debian/rsyncd.conf @@ -21,7 +21,7 @@ read only = yes read only = no [repo] - path = /www/pages/updates + path = /var/www/pages/updates comment = Patching repo uid = root read only = no @@ -51,7 +51,7 @@ read only = yes read only = no [helm_charts] - path = /www/pages/helm_charts + path = /var/www/pages/helm_charts comment = Helm chart repo uid = root read only = no