diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/todo/apache_2.4_support.mdwn | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 17b58cb..a10b890 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ ikiwiki-hosting (0.20140228) UNRELEASED; urgency=medium - Previously, when ssl was enabled, alias urls always redirected to the http site. Now, this is only done when redirect_to_https is set. + * Deal with apache 2.4 upgrade, including making sites-available files + with the .conf extension. Remains compatable with apache 2.2. + (smcv) Closes: #744789 -- Joey Hess <joeyh@debian.org> Fri, 07 Mar 2014 11:38:41 -0400 diff --git a/doc/todo/apache_2.4_support.mdwn b/doc/todo/apache_2.4_support.mdwn index 2166f61..63e7e8f 100644 --- a/doc/todo/apache_2.4_support.mdwn +++ b/doc/todo/apache_2.4_support.mdwn @@ -74,3 +74,6 @@ i have a (so far) working [[patch]] in my git repo (`git://src.anarc.at/ikiwiki- >>> >>> that process could get broken by having both ikisite-example.com and >>> ikisite-example.com.conf in sites-available. --s + +>>>> Ok, this seems acceptable and I'm ok with punting handling upgrades to +>>>> 2.4 yet, in hopes apache will deal with it. [[merged|done]] --[[Joey]] |