Merge ~kumy/libravatar:bug-1781174 into ~libravatar/libravatar:master

[Mathieu Alorent]

[François Marier (fmarier)]

I tried merging it but the SECCDNSERVERNAME placeholder isn't replaced by the postinst script and ends up in the final config.

It looks like some changes to the libravatar-www.postinst script will be needed as well.

review: Needs Fixing

[Mathieu Alorent (kumy)]

I was not using the Debian packages but sed in a Dockerfile.

Let's close if you wish.

On 15/07/2018 21:04, François Marier wrote:
> Review: Needs Fixing
>
> I tried merging it but the SECCDNSERVERNAME placeholder isn't replaced by the postinst script and ends up in the final config.
>
> It looks like some changes to the libravatar-www.postinst script will be needed as well.

[François Marier (fmarier)]

Ok, I won't have time to make the other changes and test this so let's park this for now.

Unmerged commits

b5b4c54... by Mathieu Alorent <email address hidden> on 2018-07-11

LP: #1781174 Add placeholder for Content-Security-Policy

diff --git a/config/www.apache2.conf b/config/www.apache2.conf
index 2d082b5..220e9b8 100644
--- a/config/www.apache2.conf
+++ b/config/www.apache2.conf
@@ -17,7 +17,7 @@
 
     # Content Security Policy
     # http://www.w3.org/TR/CSP/
-    Header set Content-Security-Policy: "default-src 'none' ; script-src 'self' https://ad.aloodo.com ; style-src 'self' ; img-src 'self' data: https://seccdn.libravatar.org"
+    Header set Content-Security-Policy: "default-src 'none' ; script-src 'self' https://ad.aloodo.com ; style-src 'self' ; img-src 'self' data: https://__SECCDNSERVERNAME__"
     <Location /account/confirm_email>
         Header set Content-Security-Policy: "default-src 'none' ; script-src 'self' https://ad.aloodo.com ; style-src 'self' ; img-src * data:"
     </Location>