Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Fixes for VirtualRouters in Basic Networking, especially with mutliple ranges in VLANs #1547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 14 commits into from
Jun 28, 2016
Merged

Fixes for VirtualRouters in Basic Networking, especially with mutliple ranges in VLANs #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ed820be
VR merge.py ipalias fix & dhcpconfig stub notification
May 13, 2016
2790d7a
VR CsGuestNetwork obey useextdns
May 13, 2016
8753790
VR CsDhcp: allow multiple ranges & finite lease time (fixes CLOUDSTAC…
May 13, 2016
748bf43
VR CsConfig: Add is_router(), is_dns(), has_dns(), has_metadata(), us…
May 13, 2016
6055ed6
VR CsApp: Expose config to classes, move vhost confs to proper locati…
May 13, 2016
d14a484
VR CsAddress fixes:
May 13, 2016
f379df4
VR CsConfig: reintroduce old get_dns() behaviour for redundant non-VPC's
May 18, 2016
e32cd13
VR: consistent SSL setup, vhost is not an example, but a template
May 18, 2016
7e29097
VR cloud-early-config: Fix Apache2 alias cleanup
May 30, 2016
f49a4d9
VR cloud-early-config: Commonize Apache2 common setup
May 30, 2016
72e8308
SysVM cloud-early-config: Intermediate fix for SecStore & CORS
May 30, 2016
58bdb44
SysVM: Cleanup and removal of old (and dangerous) config files
May 30, 2016
91a8faa
SysVM various fixes to previous refactorings
May 31, 2016
67eb6ca
Remove /etc/apache2/sites-enabled/000-default in cloud-early-config
wido Jun 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions 5 LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ Within the patches/systemvm/debian/config/etc/apache2 directory
Copyright (c) 2012 The Apache Software Foundation
from The Apache Software Foundation http://www.apache.org/
httpd.conf
ports.conf
sites-available/default
sites-available/default-ssl
vhostexample.conf
vhost.template

Within the patches/systemvm/debian/config/etc/ssh/ directory
licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows)
Expand Down
5 changes: 1 addition & 4 deletions 5 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,10 +892,7 @@
<exclude>systemvm/patches/debian/systemvm.vmx</exclude>
<exclude>systemvm/patches/debian/config/root/.ssh/authorized_keys</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/httpd.conf</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/ports.conf</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/sites-available/default</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/vhostexample.conf</exclude>
<exclude>systemvm/patches/debian/config/etc/apache2/vhost.template</exclude>
<exclude>systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl</exclude>
<exclude>systemvm/patches/debian/config/etc/vpcdnsmasq.conf</exclude>
<exclude>systemvm/patches/debian/config/etc/ssh/sshd_config</exclude>
Expand Down
4 changes: 1 addition & 3 deletions 4 systemvm/patches/debian/config/etc/apache2/httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
SSLProtocol all -SSLv2 -SSLv3
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
SSLHonorCipherOrder on
# Empty
23 changes: 0 additions & 23 deletions 23 systemvm/patches/debian/config/etc/apache2/ports.conf
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions 41 systemvm/patches/debian/config/etc/apache2/sites-available/default
View file
Open in desktop

This file was deleted.

175 changes: 0 additions & 175 deletions 175 systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions 6 ...bian/config/etc/apache2/vhostexample.conf → .../debian/config/etc/apache2/vhost.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,15 @@
Allow from 127.0.0.0/255.0.0.0 ::1/128
</Directory>

# Include CORS configuration **IF SET**
Include /etc/apache2/[cC][oO][rR][sS].conf

# SSL Engine Switch:
# Enable/Disable SSL for this virtual host.
SSLEngine on
SSLProtocol all -SSLv2 -SSLv3
SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
SSLHonorCipherOrder on

# A self-signed (snakeoil) certificate can be created by installing
# the ssl-cert package. See
Expand Down Expand Up @@ -223,6 +228,7 @@
# README.Debian.gz

Listen 10.1.1.1:80
NameVirtualHost 10.1.1.1:80

<IfModule mod_ssl.c>
# If you add NameVirtualHost *:443 here, you will also have to change
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.