From 07348d432138e5e9dd5338277c85f313e184ec4e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 29 Sep 2015 08:50:50 -0400 Subject: [PATCH] don't need apache patch anymore --- .../ubuntu1204_cmake/patches/apache2.patch | 40 ------------------- distros/ubuntu1204_cmake/patches/series | 1 - 2 files changed, 41 deletions(-) delete mode 100644 distros/ubuntu1204_cmake/patches/apache2.patch diff --git a/distros/ubuntu1204_cmake/patches/apache2.patch b/distros/ubuntu1204_cmake/patches/apache2.patch deleted file mode 100644 index 9710b3b63..000000000 --- a/distros/ubuntu1204_cmake/patches/apache2.patch +++ /dev/null @@ -1,40 +0,0 @@ -Last-Update: 2015-04-02 -Forwarded: no -Author: Dmitry Smirnov -Description: adapt apache2.conf to work out-of-the-box. - ---- a/misc/apache.conf.in -+++ b/misc/apache.conf.in -@@ -13,19 +13,21 @@ - Options FollowSymLinks - AllowOverride All - - -- ScriptAlias /cgi-bin/ "@CGI_PREFIX@" -+ # Remember to enable cgi mod (i.e. "a2enmod cgi"). -+ ScriptAlias /cgi-bin "@CGI_PREFIX@" - - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - AllowOverride All -+ Require all granted - - - # Use the first option to have Apache logs written to the general log - # directory, or the second to have them written to the regular Apache - # directory (you may have to change the path to that used on your system) - ErrorLog @ZM_LOGDIR@/apache-error.log -- ErrorLog /var/log/httpd/zm-error.log -+# ErrorLog /var/log/httpd/zm-error.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn -@@ -33,7 +35,7 @@ - # Use the first option to have Apache logs written to the general log - # directory, or the second to have them written to the regular Apache - # directory (you may have to change the path to that used on your system) - CustomLog @ZM_LOGDIR@/apache-access.log combined -- CustomLog /var/log/httpd/zm-access.log combined -+# CustomLog /var/log/httpd/zm-access.log combined - - diff --git a/distros/ubuntu1204_cmake/patches/series b/distros/ubuntu1204_cmake/patches/series index 4f6f53a23..fc70f4006 100644 --- a/distros/ubuntu1204_cmake/patches/series +++ b/distros/ubuntu1204_cmake/patches/series @@ -1,3 +1,2 @@ -apache2.patch default_cgi-path.patch use_libjs-mootools.patch