diff --git a/xCAT-server/debian/rules b/xCAT-server/debian/rules index 61bea8b52..f3a068123 100644 --- a/xCAT-server/debian/rules +++ b/xCAT-server/debian/rules @@ -66,7 +66,7 @@ binary-arch: chmod 644 $(rootdir)/lib/shfunctions chmod 644 $(rootdir)/share/doc/packages/xCAT-server/* echo "ScriptAlias /xcatws $(prefix)/ws/xcatws.cgi" > $(buildroot)/etc/apache2/conf.d/xcat-ws.conf - cat $(PWD)/xCAT-wsapi/xcat-ws.conf.apache2 >> $(buildroot)/etc/apache2/conf.d/xcat-ws.conf + cat $(PWD)/xCAT-wsapi/xcat-ws.conf.ubuntu >> $(buildroot)/etc/apache2/conf.d/xcat-ws.conf rm -rf $(rootdir)/ws/xcat-ws.conf* # dh_installmenu # dh_installdebconf diff --git a/xCAT-server/xCAT-wsapi/xcat-ws.conf.ubuntu b/xCAT-server/xCAT-wsapi/xcat-ws.conf.ubuntu new file mode 100644 index 000000000..48ef8bb6b --- /dev/null +++ b/xCAT-server/xCAT-wsapi/xcat-ws.conf.ubuntu @@ -0,0 +1,11 @@ +LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so +RewriteEngine On +RewriteCond %{SERVER_PORT} 80 +RewriteCond %{REQUEST_URI} xcatws +RewriteRule ^(.*)$ https://%{SERVER_NAME}$1 [R,L] + +<Files xcatws.cgi> + Order allow,deny + Allow from all +</Files> +