|
58 | 58 | 'docroot' => '/var/www/foo',
|
59 | 59 | 'manage_docroot' => false,
|
60 | 60 | 'virtual_docroot' => true,
|
| 61 | + 'virtual_use_default_docroot' => false, |
61 | 62 | 'port' => '8080',
|
62 | 63 | 'ip' => '127.0.0.1',
|
63 | 64 | 'ip_based' => true,
|
|
1747 | 1748 | it { is_expected.not_to contain_concat__fragment('NameVirtualHost *:80') }
|
1748 | 1749 | end
|
1749 | 1750 |
|
| 1751 | + context 'vhost with backwards compatible virtual_docroot' do |
| 1752 | + let :params do |
| 1753 | + { |
| 1754 | + 'docroot' => '/var/www/html', |
| 1755 | + 'virtual_docroot' => '/var/www/sites/%0', |
| 1756 | + } |
| 1757 | + end |
| 1758 | + |
| 1759 | + it { is_expected.to compile } |
| 1760 | + it { |
| 1761 | + is_expected.to contain_concat__fragment('rspec.example.com-docroot').with( |
| 1762 | + content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$}, |
| 1763 | + ) |
| 1764 | + is_expected.not_to contain_concat__fragment('rspec.example.com-docroot').with( |
| 1765 | + content: %r{^\s+DocumentRoot "/var/www/html"$}, |
| 1766 | + ) |
| 1767 | + } |
| 1768 | + end |
| 1769 | + context 'vhost with virtual_docroot and docroot' do |
| 1770 | + let :params do |
| 1771 | + { |
| 1772 | + 'docroot' => '/var/www/html', |
| 1773 | + 'virtual_use_default_docroot' => true, |
| 1774 | + 'virtual_docroot' => '/var/www/sites/%0', |
| 1775 | + } |
| 1776 | + end |
| 1777 | + |
| 1778 | + it { is_expected.to compile } |
| 1779 | + it { |
| 1780 | + is_expected.to contain_concat__fragment('rspec.example.com-docroot').with( |
| 1781 | + content: %r{^\s+VirtualDocumentRoot "/var/www/sites/%0"$}, |
| 1782 | + ) |
| 1783 | + is_expected.to contain_concat__fragment('rspec.example.com-docroot').with( |
| 1784 | + content: %r{^\s+DocumentRoot "/var/www/html"$}, |
| 1785 | + ) |
| 1786 | + } |
| 1787 | + end |
| 1788 | + |
1750 | 1789 | context 'modsec_audit_log' do
|
1751 | 1790 | let :params do
|
1752 | 1791 | {
|
|
0 commit comments