Github user wido commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1547#discussion_r65103774
--- Diff: systemvm/patches/debian/config/etc/init.d/cloud-early-config ---
@@ -801,38 +802,29 @@ setup_sshd(){
setup_vpc_apache2() {
log_it "Setting up apache web server for VPC"
chkconfig apache2 off
- rm -f /etc/apache2/conf.d/vhost*.conf
- [ -f /etc/apache2/sites-available/default ] && echo ""
>/etc/apache2/sites-available/default
- [ -f /etc/apache2/sites-available/default-ssl ] && echo
"">/etc/apache2/sites-available/default-ssl
- [ -f /etc/apache2/ports.conf ] && echo "">/etc/apache2/ports.conf
- [ -f /etc/apache2/ports.conf ] && echo "">/etc/apache2/ports.conf
- [ -f /etc/apache2/ports.conf ] && echo "">/etc/apache2/ports.conf
- [ -f /etc/apache2/conf.d/security ] && sed -i -e "s/^ServerTokens
.*/ServerTokens Prod/g" /etc/apache2/conf.d/security
- [ -f /etc/apache2/conf.d/security ] && sed -i -e "s/^ServerSignature
.*/ServerSignature Off/g" /etc/apache2/conf.d/security
-
- # Disable listing of http://SSVM-IP/icons folder for security issue. see
article
http://www.i-lateral.com/tutorials/disabling-the-icons-folder-on-an-ubuntu-web-server/
- [ -f /etc/apache2/mods-available/alias.conf ] && sed -i s/"Options
Indexes MultiViews"/"Options -Indexes MultiViews"/
/etc/apache2/mods-available/alias.conf
-
- echo "Options -Indexes" > /var/www/html/.htaccess
+ clean_ipalias_config
+ setup_apache2_common
}
clean_ipalias_config() {
-rm -f /etc/apache2/conf.d/ports.*.meta-data.conf
-rm -f /etc/apache2/sites-available/ipAlias*
-rm -f /etc/apache2/sites-enabled/ipAlias*
-rm -rf /etc/failure_config
+ # Old
+ rm -f /etc/apache2/conf.d/ports.*.meta-data.conf
+ rm -f /etc/apache2/sites-available/ipAlias*
+ rm -f /etc/apache2/sites-enabled/ipAlias*
+ rm -f /etc/apache2/conf.d/vhost*.conf
+ rm -f /etc/apache2/ports.conf
+ rm -f /etc/apache2/sites-available/default
+ rm -f /etc/apache2/sites-available/default-ssl
--- End diff --
You want to remove the files in /etc/apache2/sites-enabled as well
<pre>rm -f /etc/apache2/sites-enabled/default
rm -f /etc/apache2/sites-enabled/default-ssl</pre>
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
