diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2018-08-10 23:49:54 +0300 |
|---|---|---|
| committer | James Feist <james.feist@linux.intel.com> | 2018-08-15 01:30:19 +0300 |
| commit | d529ee2e2f3ed0e28b95c4b38458bb9828d56994 (patch) | |
| tree | bb6195759cf003e0f66aa9f5d68d0bb39ce6d765 | |
| parent | b9845d9e0155564a7b1f4a52df2c0d99dbd0d4ec (diff) | |
| download | bmcweb-d529ee2e2f3ed0e28b95c4b38458bb9828d56994.tar.xz | |
Change _PHOSPHOR_WEBUI to _STATIC_HOSTING
Changing this config option to better represent what it
does, which is to host the static files from /usr/share/www/
Change-Id: Iaf785666f59f937567b6d0319c884c8ed29d2844
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | settings.hpp.in | 2 | ||||
| -rw-r--r-- | src/webserver_main.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b8a4ce987..bb0ff4738f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ option (YOCTO_DEPENDENCIES "Use YOCTO depedencies system" OFF) option (BMCWEB_ENABLE_KVM "Enable KVM websocket interfaces" ON) option (BMCWEB_ENABLE_DBUS_REST "Enable rest dbus interfaces" ON) option (BMCWEB_ENABLE_REDFISH "Enable redfish interfaces" ON) -option (BMCWEB_ENABLE_PHOSPHOR_WEBUI "Enable webui interfaces; Requires - DBUS_REST interfaces" ON) +option (BMCWEB_ENABLE_STATIC_HOSTING "Enable hosting of static files. + For example, redfish schema and webui files" ON) # Insecure options. Every option that starts with a BMCWEB_INSECURE flag should # not be enabled by default for any platform, unless the author fully diff --git a/settings.hpp.in b/settings.hpp.in index 0e059f829f..44d8f17046 100644 --- a/settings.hpp.in +++ b/settings.hpp.in @@ -3,7 +3,7 @@ #cmakedefine BMCWEB_ENABLE_KVM #cmakedefine BMCWEB_ENABLE_DBUS_REST #cmakedefine BMCWEB_ENABLE_REDFISH -#cmakedefine BMCWEB_ENABLE_PHOSPHOR_WEBUI +#cmakedefine BMCWEB_ENABLE_STATIC_HOSTING #cmakedefine BMCWEB_INSECURE_DISABLE_CSRF_PREVENTION #cmakedefine BMCWEB_INSECURE_DISABLE_SSL #cmakedefine BMCWEB_INSECURE_DISABLE_XSS_PREVENTION diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp index e2a776a7e4..2f89ad4269 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -61,7 +61,7 @@ int main(int argc, char** argv) { // Static assets need to be initialized before Authorization, because auth // needs to build the whitelist from the static routes -#ifdef BMCWEB_ENABLE_PHOSPHOR_WEBUI +#ifdef BMCWEB_ENABLE_STATIC_HOSTING crow::webassets::requestRoutes(app); #endif |