Reformulate the headers showing the license.

To be clearer, and to follow the recommendation of the FSF, we include
a full header rather than a single sentence.

9 files changed, 113 insertions, 27 deletions

diff --git a/lib/openldap b/lib/openldap
index cbb58c4..ab35fdb 100644
--- a/lib/openldap
+++ b/lib/openldap
@@ -1,11 +1,20 @@
 #!/usr/bin/python
-#
+
 # Manage OpenLDAP databases
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import ldap, ldap.sasl
 from ldap.filter  import filter_format
@@ -15,6 +24,7 @@ from ldif         import LDIFParser
 from functools    import partial
 import re
 
+
 # Dirty hack to check equality between the targetted LDIF and that
 # currently in the directory.  The value of some configuration (olc*)
 # attributes is automatically indexed when added; for those we remove
diff --git a/lib/postmap b/lib/postmap
index 8c6c319..5eba760 100644
--- a/lib/postmap
+++ b/lib/postmap
@@ -1,12 +1,20 @@
 #!/usr/bin/python
+
+# Create or update postfix's alias and lookup tables
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Create or update postfix's alias and lookup tables through ansible
-# playbooks.
-#
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 try:
     import selinux
diff --git a/lib/postmulti b/lib/postmulti
index a6e971c..4f5cbcd 100644
--- a/lib/postmulti
+++ b/lib/postmulti
@@ -1,11 +1,20 @@
 #!/usr/bin/python
-#
+
 # Create and manage postfix instances.
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # Look up postfix configuration variable
diff --git a/roles/common/files/etc/ldap/schema/fripost.ldif b/roles/common/files/etc/ldap/schema/fripost.ldif
index 6ec55dc..851988e 100644
--- a/roles/common/files/etc/ldap/schema/fripost.ldif
+++ b/roles/common/files/etc/ldap/schema/fripost.ldif
@@ -1,7 +1,18 @@
 # Fripost's LDAP schema
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Load this file with
 #
diff --git a/roles/common/files/etc/network/if-post-down.d/iptables b/roles/common/files/etc/network/if-post-down.d/iptables
index 944ff3a..d27977d 100755
--- a/roles/common/files/etc/network/if-post-down.d/iptables
+++ b/roles/common/files/etc/network/if-post-down.d/iptables
@@ -1,12 +1,21 @@
 #!/bin/sh
-#
+
 # A post-down hook to flush ip tables and delete custom chains in the
 # loaded v4 and v6 rulesets.
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -ue
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/roles/common/files/etc/network/if-pre-up.d/iptables b/roles/common/files/etc/network/if-pre-up.d/iptables
index 644211f..2b83cdc 100755
--- a/roles/common/files/etc/network/if-pre-up.d/iptables
+++ b/roles/common/files/etc/network/if-pre-up.d/iptables
@@ -1,13 +1,22 @@
 #!/bin/bash
-#
+
 # A pre-up hook to auto-(re)load the iptables rulesets whenever the
 # network is brought up. If the action fails, an alert message is passed
 # to syslogd.
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -uo pipefail
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/roles/common/files/etc/network/if-up.d/ipsec b/roles/common/files/etc/network/if-up.d/ipsec
index db9f979..4a84112 100755
--- a/roles/common/files/etc/network/if-up.d/ipsec
+++ b/roles/common/files/etc/network/if-up.d/ipsec
@@ -1,12 +1,21 @@
 #!/bin/sh
-#
+
 # A post-up/down hook to automatically create/delete a 'sec' VLAN
 # device, and a dedicated, host-scoped, IP for IPSec (v4 only).
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -ue
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/roles/common/files/usr/local/sbin/update-firewall.sh b/roles/common/files/usr/local/sbin/update-firewall.sh
index 41407e8..4050e9e 100755
--- a/roles/common/files/usr/local/sbin/update-firewall.sh
+++ b/roles/common/files/usr/local/sbin/update-firewall.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-#
+
 # Create iptables (v4 and v6) rules.  Unless one of [-f] or [-c] is
 # given, or if the ruleset is unchanged, a confirmation is asked after
 # loading the new rulesets; if the user answers No or doesn't answer,
@@ -16,10 +16,20 @@
 #
 # Dependencies: netmask(1)
 #
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set -ue
 PATH=/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/roles/common/templates/etc/ldap/database.ldif.j2 b/roles/common/templates/etc/ldap/database.ldif.j2
index fc4ce4b..19fcdd0 100644
--- a/roles/common/templates/etc/ldap/database.ldif.j2
+++ b/roles/common/templates/etc/ldap/database.ldif.j2
@@ -1,7 +1,18 @@
 # Fripost's LDAP database definition
-# Copyright 2013 Guilhem Moulin <guilhem@fripost.org>
+# Copyright © 2013 Guilhem Moulin <guilhem@fripost.org>
 #
-# Licensed under the GNU GPL version 3 or higher.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 dn: olcDatabase=hdb,cn=config
 objectClass: olcDatabaseConfig