starlingx/config-files
Code Issues Proposed changes

Merge "relocate /www to /var/www"

Browse Source
This commit is contained in:
Zuul 2021-12-15 21:41:04 +00:00 committed by Gerrit Code Review
commit 1f070c856c
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dhcp-config/files/dhclient-enter-hooks
View File

@ -17,7 +17,7 @@ source /etc/platform/platform.conf
if [ -n "$wrs_install_uuid" ]; then if [ -n "$wrs_install_uuid" ]; then
if [ "$nodetype" == "controller" ]; then if [ "$nodetype" == "controller" ]; then
source /etc/build.info 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") INSTALL_UUID=$(cat "$file")
fi fi
if [ "$INSTALL_UUID" != "$wrs_install_uuid" ]; then if [ "$INSTALL_UUID" != "$wrs_install_uuid" ]; then

8
lighttpd-config/centos/lighttpd-config.spec
View File

@ -30,7 +30,7 @@ StarlingX lighttpd configuration file
%install %install
CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
ROOTDIR=%{buildroot}/www ROOTDIR=%{buildroot}/var/www
install -d -m 1777 ${ROOTDIR}/tmp install -d -m 1777 ${ROOTDIR}/tmp
install -d ${CONFDIR}/ssl install -d ${CONFDIR}/ssl
@ -67,7 +67,7 @@ fi
%{_datadir}/starlingx/lighttpd.conf %{_datadir}/starlingx/lighttpd.conf
%{_datadir}/starlingx/lighttpd.logrotate %{_datadir}/starlingx/lighttpd.logrotate
%{_datadir}/starlingx/lighttpd.init %{_datadir}/starlingx/lighttpd.init
%dir /www/pages/ %dir /var/www/pages/
/www/pages/* /var/www/pages/*
%config(noreplace) %{_sysconfdir}/lighttpd/lighttpd-inc.conf %config(noreplace) %{_sysconfdir}/lighttpd/lighttpd-inc.conf
/www/pages/index.html /var/www/pages/index.html

2
lighttpd-config/files/lighttpd.conf
View File

@ -39,7 +39,7 @@ server.modules = (
## a static document-root, for virtual-hosting take look at the ## a static document-root, for virtual-hosting take look at the
## server.virtual-* options ## server.virtual-* options
server.document-root = "/www/pages/" server.document-root = "/var/www/pages/"
## where to send error-messages to ## where to send error-messages to
server.errorlog = "/var/log/lighttpd-error.log" server.errorlog = "/var/log/lighttpd-error.log"

8
lighttpd-config/files/lighttpd.init
View File

@ -54,11 +54,11 @@ start()
done done
echo -n "Mounting scratch filesystem to chroot tmp..." 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 rm -r /scratch/lighttpd >& /dev/null
mkdir -p /scratch/lighttpd mkdir -p /scratch/lighttpd
mount --bind /scratch/lighttpd /www/tmp/ mount --bind /scratch/lighttpd /var/www/tmp/
chown www /www/tmp/ chown www /var/www/tmp/
echo -n "Starting $DESC..." echo -n "Starting $DESC..."
@ -86,7 +86,7 @@ stop()
fi fi
rm -f $PIDFILE rm -f $PIDFILE
echo -n "Unmounting scratch filesystem from chroot tmp..." echo -n "Unmounting scratch filesystem from chroot tmp..."
umount /www/tmp umount /var/www/tmp
} }
status() status()

4
lighttpd-config/files/lighttpd.logrotate
View File

@ -1,7 +1,7 @@
/var/log/lighttpd-access.log /var/log/lighttpd-access.log
/var/log/lighttpd-error.log /var/log/lighttpd-error.log
/www/var/log/lighttpd-access.log /var/www/var/log/lighttpd-access.log
/www/var/log/lighttpd-error.log { /var/www/var/log/lighttpd-error.log {
nodateext nodateext
size 10M size 10M
start 1 start 1

4
rsync-config/files/rsyncd.conf
View File

@ -21,7 +21,7 @@ read only = yes
read only = no read only = no
[repo] [repo]
path = /www/pages/updates path = /var/www/pages/updates
comment = Patching repo comment = Patching repo
uid = root uid = root
read only = no read only = no
@ -51,7 +51,7 @@ read only = yes
read only = no read only = no
[helm_charts] [helm_charts]
path = /www/pages/helm_charts path = /var/www/pages/helm_charts
comment = Helm chart repo comment = Helm chart repo
uid = root uid = root
read only = no read only = no

4
rsync-config/source-debian/rsyncd.conf
View File

@ -21,7 +21,7 @@ read only = yes
read only = no read only = no
[repo] [repo]
path = /www/pages/updates path = /var/www/pages/updates
comment = Patching repo comment = Patching repo
uid = root uid = root
read only = no read only = no
@ -51,7 +51,7 @@ read only = yes
read only = no read only = no
[helm_charts] [helm_charts]
path = /www/pages/helm_charts path = /var/www/pages/helm_charts
comment = Helm chart repo comment = Helm chart repo
uid = root uid = root
read only = no read only = no