diff --git a/doc/content/articles/miniweb.article b/doc/content/articles/miniweb.article index 53eb6bba1..002633570 100644 --- a/doc/content/articles/miniweb.article +++ b/doc/content/articles/miniweb.article @@ -42,7 +42,7 @@ preferably the head node. It has many flags, seen here: -passwords string password file for auth -root string - base path for web files (default "misc/web") + base path for web files (default "web") -v log on stderr (default true) -verbose log on stderr (default true) diff --git a/doc/content/training/module04.slide b/doc/content/training/module04.slide index ebfd4d34b..677d7ae8a 100644 --- a/doc/content/training/module04.slide +++ b/doc/content/training/module04.slide @@ -51,7 +51,7 @@ This will print the available options for miniweb Assuming minimega is located in /opt/bin/minimega, use: - $ ./miniweb -root /opt/misc/web -console -base /opt & + $ ./miniweb -root /opt/web -console -base /opt & - miniweb supports per-path authentication so that users can be limited to specific namespaces or VMs. diff --git a/doc/content/training/module04_content/mw_help.mm b/doc/content/training/module04_content/mw_help.mm index c162cd629..6ce8c21b1 100644 --- a/doc/content/training/module04_content/mw_help.mm +++ b/doc/content/training/module04_content/mw_help.mm @@ -16,6 +16,6 @@ base path for minimega (default "/tmp/minimega") -passwords string password file for auth -root string - base path for web files (default "misc/web") + base path for web files (default "web") -v, -verbose log on stderr (default true) diff --git a/docker/README.md b/docker/README.md index 78d3b9ad5..1a2e9cb07 100644 --- a/docker/README.md +++ b/docker/README.md @@ -100,7 +100,7 @@ MM_LOGFILE=/var/log/minimega.log By default, the following values are set for miniweb: ``` -MINIWEB_ROOT=/opt/minimega/misc/web +MINIWEB_ROOT=/opt/minimega/web MINIWEB_HOST=0.0.0.0 MINIWEB_PORT=9001 ``` diff --git a/packaging/debian/.gitignore b/packaging/debian/.gitignore index d397c2727..3c50b07fa 100644 --- a/packaging/debian/.gitignore +++ b/packaging/debian/.gitignore @@ -1,3 +1,4 @@ minimega.deb minimega/opt minimega/usr +minimega/DEBIAN/control \ No newline at end of file diff --git a/packaging/debian/build.bash b/packaging/debian/build.bash index b78e8fc77..9ffc44b5c 100755 --- a/packaging/debian/build.bash +++ b/packaging/debian/build.bash @@ -19,7 +19,7 @@ mkdir -p $DST/misc cp -r $MM/misc/daemon $DST/misc/ cp -r $MM/misc/vmbetter_configs $DST/misc/ mkdir -p $DST/web -cp -r $MM/web $DST/web/ +cp -r $MM/web $DST/ DOCS=$SCRIPT_DIR/minimega/usr/share/doc/minimega mkdir -p $DOCS