arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

defect 4625: fix the issue that restapi does not work on Ubuntu

Browse Source
This commit is contained in:
WangXiaoPeng 2015-03-26 06:17:17 -04:00
parent 21204f4dde
commit aa7765accf
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/debian/postrm
View File

@ -30,7 +30,7 @@ case "$1" in
update-rc.d xcatd disable
rm -f /usr/sbin/xcatd #remove the symbolic
rm -f /etc/apache2/conf.d/xcat-ws.conf
rm -f /etc/apache2/conf-enabled/xcat-ws.conf
;;
*)

5
xCAT-server/debian/rules
View File

@ -66,9 +66,10 @@ binary-arch:
chmod 644 $(rootdir)/lib/perl/xCAT_schema/samples/*
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.ubuntu >> $(buildroot)/etc/apache2/conf.d/xcat-ws.conf
echo "ScriptAlias /xcatws $(prefix)/ws/xcatws.cgi" > $(buildroot)/etc/apache2/conf-available/xcat-ws.conf
cat $(PWD)/xCAT-wsapi/xcat-ws.conf.ubuntu >> $(buildroot)/etc/apache2/conf-available/xcat-ws.conf
rm -rf $(rootdir)/ws/xcat-ws.conf*
ln -s ../conf-available/xcat-ws.conf $(buildroot)/etc/apache2/conf-enabled/xcat-ws.conf
# dh_installmenu
# dh_installdebconf
# dh_installlogrotate

4
xCAT-server/xCAT-wsapi/xcat-ws.conf.ubuntu
View File

@ -1,11 +1,11 @@
LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.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
Require all granted
</Files>