Compare commits

..

No commits in common. "c8a157ad49f9652be3d14707f7c6935e92678ab7" and "c23ab2a4db98522bd202acfc7499a714063ce4ef" have entirely different histories.

2 changed files with 2 additions and 5 deletions

View File

@ -78,7 +78,7 @@ vars:
"phpm" string => "php"; "phpm" string => "php";
ubuntu:: ubuntu::
"modules" data => '[ "modules" string => '[
{m:"$(phpm)",f:"libphp$(install_php.version)"}, {m:"$(phpm)",f:"libphp$(install_php.version)"},
{m:"proxy",f:"mod_proxy"}, {m:"proxy",f:"mod_proxy"},
{m:"proxy_http",f:"mod_proxy_http"}, {m:"proxy_http",f:"mod_proxy_http"},

View File

@ -567,13 +567,10 @@ SSLRandomSeed connect builtin
DirectoryIndex index.html DirectoryIndex index.html
</Directory> </Directory>
<VirtualHost *:80> <VirtualHost *:80>
{{#vars.apache.admin_email}} ServerAdmin webmaster@dummy-host.example.com
ServerAdmin {{.}}
{{/vars.apache.admin_email}}
DocumentRoot "{{vars.apache.default_html_dir}}" DocumentRoot "{{vars.apache.default_html_dir}}"
ErrorLog "{{vars.apache.log_dir}}/default-error.log" ErrorLog "{{vars.apache.log_dir}}/default-error.log"
CustomLog "{{vars.apache.log_dir}}/default-access.log" common CustomLog "{{vars.apache.log_dir}}/default-access.log" common
DirectoryIndex index.php index.html
</VirtualHost> </VirtualHost>