From ff1c33b4d71babae458c721ac994d6034f9caf82 Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Mon, 12 Dec 2016 11:35:14 -0800 Subject: [PATCH] Remove document for proxy setting This document contains apache server setting about enable proxy server which can be used by valence webUI to directly invoke pod manager. Now this solution is not needed any more after webUI call valence api insead of pod manager. Change-Id: Ic48ff2feddc1aed86ea9c020d03a3ee8ac011573 --- doc/ui-proxy/apache/README.md | 71 ----------------------------- doc/ui-proxy/apache/podm-proxy.conf | 49 -------------------- 2 files changed, 120 deletions(-) delete mode 100644 doc/ui-proxy/apache/README.md delete mode 100644 doc/ui-proxy/apache/podm-proxy.conf diff --git a/doc/ui-proxy/apache/README.md b/doc/ui-proxy/apache/README.md deleted file mode 100644 index 61b1a71..0000000 --- a/doc/ui-proxy/apache/README.md +++ /dev/null @@ -1,71 +0,0 @@ -Apache proxy service to pod-manager API -======================================= - -This manual has been verified on Ubuntu 16.04 + Apache (2.4.18-2ubuntu3.1). - -##Install -1. Use package manager tool on your distribution to install apache server. - ``` - sudo apt-get install apache2 - ``` -2. Enable all related modules for Apache server. - ``` - sudo a2enmod proxy_http proxy ssl headers - ``` -3. Setup virtual host for proxy to podm. - ``` - sudo cp podm-proxy.conf /etc/apache2/sites-available - sudo a2ensite podm-proxy - ``` -4. Add listening port 6000. - Add "Listen 6000" into Apaches port setting file /etc/apache2/ports.conf. - * If need, you can change it to any available port in your server. In this case, please remember to update - "" in /etc/apache2/sites-available/podm-proxy.conf. -5. Update podm address in /etc/apache2/sites-available/podm-proxy.conf. - By default, the podm api is pointed to https://127.0.0.1:8443/. Update it to fit your environment. -6. Restart Apache server. - ``` - sudo systemctl restart apache2 - ``` - -The proxy is available under http://127.0.0.1:6000/redfish/v1. - ``` - curl http://127.0.0.1:6000/redfish/v1/ - { - "@odata.context" : "/redfish/v1/$metadata#ServiceRoot", - "@odata.id" : "/redfish/v1", - "@odata.type" : "#ServiceRoot.1.0.0.ServiceRoot", - "Id" : "ServiceRoot", - "Name" : "Service root", - "RedfishVersion" : "1.0.0", - "UUID" : "3c414ee3-bd28-4e6c-b9e8-fd8008dbd0ce", - "Chassis" : { - "@odata.id" : "/redfish/v1/Chassis" - }, - "Services" : { - "@odata.id" : "/redfish/v1/Services" - }, - "Systems" : { - "@odata.id" : "/redfish/v1/Systems" - }, - "Managers" : { - "@odata.id" : "/redfish/v1/Managers" - }, - "EventService" : { - "@odata.id" : "/redfish/v1/EventService" - }, - "Nodes" : { - "@odata.id" : "/redfish/v1/Nodes" - }, - "EthernetSwitches" : { - "@odata.id" : "/redfish/v1/EthernetSwitches" - }, - "Oem" : { - "Intel_RackScale" : { - "@odata.type" : "#Intel.Oem.ServiceRoot", - "ApiVersion" : "1.2.0" - } - }, - "Links" : { } - } - ``` diff --git a/doc/ui-proxy/apache/podm-proxy.conf b/doc/ui-proxy/apache/podm-proxy.conf deleted file mode 100644 index 341fce0..0000000 --- a/doc/ui-proxy/apache/podm-proxy.conf +++ /dev/null @@ -1,49 +0,0 @@ - - # Reserve proxy to podm - ProxyRequests Off - - # If needed, change following default pod address https://127.0.0.1:8443/ - # to real podm api in your environment. - ProxyPass / https://127.0.0.1:8443/ - ProxyPassReverse / https://127.0.0.1:8443/ - - - Order Deny,Allow - Allow from all - - - # Ignore ssl certificate check when proxy request to podm - SSLProxyEngine on - SSLProxyVerify none - SSLProxyCheckPeerCN off - SSLProxyCheckPeerName off - SSLProxyCheckPeerExpire off - - # Append http header in request to podm to set up authorization. - # Default username/password: admin/admin. Please change to fit your specific setting. - RequestHeader set Authorization 'Basic YWRtaW46YWRtaW4=' - RequestHeader set User-Agent 'Mozilla/5.0 (Windows NT 6.1; Win64; x64)' - - # Append http header in response to enable CORS - Header set Access-Control-Allow-Origin "*" - Header set Access-Control-Allow-Methods "GET, POST, PUT, OPTIONS" - Header set Access-Control-Allow-Headers "Origin, Accept, Content-Type, X-Requested-With, X-CSRF-Token" - - # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, - # error, crit, alert, emerg. - # It is also possible to configure the loglevel for particular - # modules, e.g. - #LogLevel info ssl:warn - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - # For most configuration files from conf-available/, which are - # enabled or disabled at a global level, it is possible to - # include a line for only one particular virtual host. For example the - # following line enables the CGI configuration for this host only - # after it has been globally disabled with "a2disconf". - #Include conf-available/serve-cgi-bin.conf - - -# vim: syntax=apache ts=4 sw=4 sts=4 sr noet