Item13750: repackage using new data form

foswiki · Sep 25, 2015 · f4c3d74 · f4c3d74
1 parent cc371c7
commit f4c3d74
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 16 deletions.
diff --git a/data/System/DisqusPlugin.txt b/data/System/DisqusPlugin.txt
@@ -45,20 +45,46 @@ See also comments above.
 
 %$INSTALL_INSTRUCTIONS%
 
----++ Info
-<!--
-   * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
--->
+---++ Content Security Policy
+
+If you are using %TOPIC% together with [[Foswiki:Extensions/SecurityHeadersPlugin][SecurityHeadersPlugin]] you will have
+to adjust the policy as follows:
+
+   * add =*.disqus.com *.disquscdn.com= to =script-src=
+   * add =*.disqus.com *.disquscdn.com= to =style-src=
+   * add =*.disqus.com= to =connect-src=
+
+You might see related error reports in the javascript console of your browser as well as CSP-reports in the server logs
+in case you configured =report-uri= in the <nop>SecurityHeadersPlugin's configuration.
+
+This will look like this for instance:
 
-|  Author(s): | Michael Daum|
-|  Copyright: | &copy; 2011-2014 Michael Daum http://michaeldaumconsulting.com |
-|  License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] |
-|  Release: | %$RELEASE% |
-|  Version: | %$VERSION% |
-|  Change History: | <!-- versions below in reverse order -->&nbsp; |
+<verbatim>
+$Foswiki::cfg{Http}{ContentSecurityPolicy}{"script-src"} = "'self' *.disqus.com *.disquscdn.com";
+$Foswiki::cfg{Http}{ContentSecurityPolicy}{"style-src"} = "'self' *.disqus.com *.disquscdn.com";
+$Foswiki::cfg{Http}{ContentSecurityPolicy}{"connect-src"}= "'self' *.disqus.com"; 
+</verbatim>
+
+---++ Dependencies
+%$DEPENDENCIES%
+
+---++ Change History
+
+%TABLE{columnwidths="7em" tablewidth="100%"}%
+|  25 Aug 2015 | added docu on content security policy |
 |  31 Aug 2015 | ignore discussions in template (_) webs |
 |  16 Dec 2014 | make it work with async page loads as per <nop>AngularSkin |
 |   5 May 2013 | initial release |
-|  Dependencies: | %$DEPENDENCIES% |
-|  Home page: | Foswiki:Extensions/%TOPIC% |
-|  Support: | Foswiki:Support/%TOPIC% |
+<!--
+   * Set SHORTDESCRIPTION = %$SHORTDESCRIPTION%
+-->
+
+%META:FORM{name="PackageForm"}%
+%META:FIELD{name="Author" title="Author" value="Michael Daum"}%
+%META:FIELD{name="Copyright" title="Copyright" value="&copy; 2011-2015 Michael Daum http://michaeldaumconsulting.com"}%
+%META:FIELD{name="Home" title="Home" value="http://foswiki.org/Extensions/DisqusPlugin"}%
+%META:FIELD{name="License" title="License" value="[[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]]"}%
+%META:FIELD{name="Release" title="Release" value="%$RELEASE%"}%
+%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/DisqusPlugin"}%
+%META:FIELD{name="Support" title="Support" value="Foswiki:Support/%TOPIC%"}%
+%META:FIELD{name="Version" title="Version" value="%$VERSION%"}%
diff --git a/lib/Foswiki/Plugins/DisqusPlugin.pm b/lib/Foswiki/Plugins/DisqusPlugin.pm
@@ -1,6 +1,6 @@
 # Plugin for Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 #
-# DisqusPlugin is Copyright (C) 2013-2014 Michael Daum http://michaeldaumconsulting.com
+# DisqusPlugin is Copyright (C) 2013-2015 Michael Daum http://michaeldaumconsulting.com
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -22,8 +22,8 @@ use Foswiki::Func ();
 use Foswiki::Meta ();
 use Digest::MD5 ();
 
-our $VERSION = '2.01';
-our $RELEASE = '2.01';
+our $VERSION = '2.02';
+our $RELEASE = '25 Sep 2015';
 our $SHORTDESCRIPTION = 'Disqus-based commenting system';
 our $NO_PREFS_IN_TOPIC = 1;
 our $doneDisqusInit = 0;