Skip to content

Commit 15da6ff

Browse files
bplaattimschumi
authored andcommitted
Base: Move webroot to /var/www
1 parent b386b48 commit 15da6ff

File tree

7 files changed

+4
-6
lines changed

7 files changed

+4
-6
lines changed

Base/etc/fstab

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
/home /home bind immutable,bind,nodev,nosuid
88
/root /root bind immutable,bind,nodev,nosuid
99
/var /var bind immutable,bind,nodev,nosuid
10-
/www /www bind immutable,bind,nodev,nosuid
1110
/usr/Tests /usr/Tests bind immutable,bind,nodev,ro
1211
/usr/local /usr/local bind immutable,bind,nodev,nosuid
1312
/usr/Ports /usr/Ports bind immutable,bind,nodev,nosuid
14-
File renamed without changes.
File renamed without changes.
File renamed without changes.

Meta/build-root-filesystem.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ chmod 755 mnt/usr/share/HackStudio/templates/*.postcreate
139139
echo "done"
140140

141141
printf "creating initial filesystem structure... "
142-
for dir in bin etc proc mnt tmp boot www var/run usr/local usr/Ports usr/bin; do
142+
for dir in bin etc proc mnt tmp boot var/run usr/local usr/Ports usr/bin; do
143143
mkdir -p mnt/$dir
144144
done
145145
chmod 700 mnt/boot

Meta/lint-executable-resources.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ cd "$script_path/.."
77

88
if [ "$(uname -s)" = "Darwin" ]; then
99
# MacOS's find does not support '-executable' OR '-perm /mode'.
10-
BAD_FILES=$(find Base/etc/ Base/res/ Base/www/ -type f -perm +111)
10+
BAD_FILES=$(find Base/etc/ Base/res/ Base/var/www/ -type f -perm +111)
1111
else
12-
BAD_FILES=$(find Base/etc/ Base/res/ Base/www/ -type f -executable)
12+
BAD_FILES=$(find Base/etc/ Base/res/ Base/var/www/ -type f -executable)
1313
fi
1414

1515
if [ -n "${BAD_FILES}" ]

Userland/Services/WebServer/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
2424
{
2525
static auto const default_listen_address = "0.0.0.0"_string;
2626
static auto const default_port = 8000;
27-
static auto const default_document_root_path = "/www"_string;
27+
static auto const default_document_root_path = "/var/www"_string;
2828

2929
ByteString listen_address = default_listen_address.to_byte_string();
3030
int port = default_port;

0 commit comments

Comments
 (0)