Pour des raisons de cohérence, perms est devenu mode

2015-05-10 15:19:17 +02:00 · 2015-05-10 15:19:17 +02:00 · 15902c8b57
commit 15902c8b57
parent 2c75866ad9
156 changed files with 187 additions and 181 deletions
--- a/Python/etc/arpwatch.conf
+++ b/Python/etc/arpwatch.conf
@ -3,7 +3,7 @@ header()

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644


 # /etc/arpwatch.conf: Debian-specific way to watch multiple interfaces.
--- a/Python/etc/backuppc/config.pl
+++ b/Python/etc/backuppc/config.pl
@ -3,7 +3,7 @@ include("secrets")

 info["owner"] = "backuppc"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

@#============================================================= -*-perl-*-
@#
--- a/Python/etc/backuppc/hosts
+++ b/Python/etc/backuppc/hosts
@ -4,7 +4,7 @@ include("backups")

 info["owner"] = "backuppc"
 info["group"] = "adm"
-info["perms"] = 0640
+info["mode"] = 0640

 def backuppc_hosts(comment, hostslist):
    print "# %s" % comment
--- a/Python/etc/bind/db.fake
+++ b/Python/etc/bind/db.fake
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644


 import config
--- a/Python/etc/bind/db.loppsi.crans.org
+++ b/Python/etc/bind/db.loppsi.crans.org
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644


 import config
--- a/Python/etc/bind/db.rpz.crans.org
+++ b/Python/etc/bind/db.rpz.crans.org
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644


 import config
--- a/Python/etc/bind/named.conf
+++ b/Python/etc/bind/named.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "//"

--- a/Python/etc/bind/named.conf.local
+++ b/Python/etc/bind/named.conf.local
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644

 import config
 import config.dns
--- a/Python/etc/bind/named.conf.notify
+++ b/Python/etc/bind/named.conf.notify
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "//"

--- a/Python/etc/bind/named.conf.options
+++ b/Python/etc/bind/named.conf.options
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "bind"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "//"

--- a/Python/etc/bind/rndc.key
+++ b/Python/etc/bind/rndc.key
@ -2,7 +2,7 @@ include("secrets")

 info["owner"] = "bind"
 info["group"] = "bind"
-info["perms"] = 0640
+info["mode"] = 0640


@// Fichier gere par BCfg2 (plugin Python)
--- a/Python/etc/crans/secrets/README
+++ b/Python/etc/crans/secrets/README
@ -1,2 +1,2 @@
-info["perms"] = 0640
+info["mode"] = 0640
 print file("/etc/crans/secrets/README").read()
--- a/Python/etc/crans/secrets/dhcp.py
+++ b/Python/etc/crans/secrets/dhcp.py
@ -1,4 +1,4 @@
-info["perms"] = 0440
+info["mode"] = 0440
 if has("users") or has("2B"):
    info["owner"] = "respbats"
 else:
--- a/Python/etc/crans/secrets/icecast-token
+++ b/Python/etc/crans/secrets/icecast-token
@ -1,4 +1,5 @@
-info["perms"] = 0440
+info["mode"] = 0440
 info["owner"] = "root"
 info["group"] = "adm"
+
 print file("/etc/crans/secrets/icecast-token").read()
--- a/Python/etc/crans/secrets/nols.py
+++ b/Python/etc/crans/secrets/nols.py
@ -1,3 +1,3 @@
-info["perms"] = 0440
+info["mode"] = 0440
 info["group"] = "adm"
 print file("/etc/crans/secrets/nols.py").read()
--- a/Python/etc/crans/secrets/privatekey_passphrase
+++ b/Python/etc/crans/secrets/privatekey_passphrase
@ -1,4 +1,4 @@
-info["perms"] = 0440
+info["mode"] = 0440
 if has("users") or has("2B"):
    info["owner"] = "respbats"
 else:
--- a/Python/etc/crans/secrets/rabbitmq_trigger_password
+++ b/Python/etc/crans/secrets/rabbitmq_trigger_password
@ -1,4 +1,5 @@
-info["perms"] = 0440
+info["mode"] = 0440
 info["owner"] = "root"
 info["group"] = "adm"
+
 print file("/etc/crans/secrets/rabbitmq_trigger_password").read()
--- a/Python/etc/crans/secrets/rsyncd.secrets
+++ b/Python/etc/crans/secrets/rsyncd.secrets
@ -1,2 +1,4 @@
-info["perms"] = 0600
+# -*- coding: utf-8 -*-
+info["mode"] = 0600
+
 print file("/etc/crans/secrets/rsyncd.secrets").read()
--- a/Python/etc/crans/secrets/secrets.py
+++ b/Python/etc/crans/secrets/secrets.py
@ -1,7 +1,8 @@
-info["perms"] = 0440
+info["mode"] = 0440
 if has("users") or has("2B"):
    info["owner"] = "respbats"
 else:
    info["owner"] = "root"
 info["group"] = "adm"
+
 print file("/etc/crans/secrets/secrets.py").read()
--- a/Python/etc/crans/secrets/slon.py
+++ b/Python/etc/crans/secrets/slon.py
@ -1,3 +1,3 @@
-info["perms"] = 0440
+info["mode"] = 0440
 info["group"] = "adm"
 print file("/etc/crans/secrets/slon.py").read()
--- a/Python/etc/crans/secrets/trigger-generate
+++ b/Python/etc/crans/secrets/trigger-generate
@ -1,4 +1,5 @@
-info["perms"] = 0440
+info["mode"] = 0440
 info["owner"] = "root"
 info["group"] = "adm"
+
 print file("/etc/crans/secrets/trigger-generate").read()
--- a/Python/etc/crans/secrets/trigger-generate.pub
+++ b/Python/etc/crans/secrets/trigger-generate.pub
@ -1,4 +1,4 @@
-info["perms"] = 0444
+info["mode"] = 0444
 info["owner"] = "root"
 info["group"] = "adm"
 print file("/etc/crans/secrets/trigger-generate.pub").read()
--- a/Python/etc/crans/services.py
+++ b/Python/etc/crans/services.py
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "#"

--- a/Python/etc/crans/wgetrc_monit
+++ b/Python/etc/crans/wgetrc_monit
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

 include("secrets")

--- a/Python/etc/cron.d/check_cert
+++ b/Python/etc/cron.d/check_cert
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 header("Check SSL certificates")

--- a/Python/etc/cron.d/firewall
+++ b/Python/etc/cron.d/firewall
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 include("ip")

--- a/Python/etc/cron.d/generate
+++ b/Python/etc/cron.d/generate
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 include("ip")

--- a/Python/etc/cron.d/monit
+++ b/Python/etc/cron.d/monit
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 header()

--- a/Python/etc/cron.d/munin-node
+++ b/Python/etc/cron.d/munin-node
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 header("Cronjob munin-node")
 print """
--- a/Python/etc/cron.d/secours
+++ b/Python/etc/cron.d/secours
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 if has('connexion-secours-test'):
    header("Teste la disponibilité de la connexion normale et passe en secours si besoin")
--- a/Python/etc/cron.d/sshFingerprint
+++ b/Python/etc/cron.d/sshFingerprint
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 include("ip")

--- a/Python/etc/cron.daily/git_dirty_repo
+++ b/Python/etc/cron.daily/git_dirty_repo
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0755
+info["mode"] = 0755

@#!/bin/bash
 header()
--- a/Python/etc/cron.weekly/git_dirty_repo
+++ b/Python/etc/cron.weekly/git_dirty_repo
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0755
+info["mode"] = 0755

@#!/bin/bash
 header()
--- a/Python/etc/default/monit
+++ b/Python/etc/default/monit
@ -3,7 +3,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 header('Demarrage de monit')

--- a/Python/etc/default/mumudvb
+++ b/Python/etc/default/mumudvb
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "adm"
-info["perms"] = 0644
+info["mode"] = 0644

 header('Fichier de configuration de mumudvb')

--- a/Python/etc/dhcp3/dhcp-failover.conf
+++ b/Python/etc/dhcp3/dhcp-failover.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

 comment_start = "#"

--- a/Python/etc/dhcp3/dhcpd.conf
+++ b/Python/etc/dhcp3/dhcpd.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

 comment_start = "#"

--- a/Python/etc/dhcp3/omapi.conf
+++ b/Python/etc/dhcp3/omapi.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

 comment_start = "#"

--- a/Python/etc/ejabberd/ejabberd.cfg
+++ b/Python/etc/ejabberd/ejabberd.cfg
@ -2,7 +2,7 @@

 info["owner"] = "ejabberd"
 info["group"] = "ejabberd"
-info["perms"] = 0640
+info["mode"] = 0640


 include("secrets")
--- a/Python/etc/icecast2/radio.xml
+++ b/Python/etc/icecast2/radio.xml
@ -1,7 +1,7 @@
 # -*- mode: python; encoding: utf-8 -*-
 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 import urlparse
 import urllib
--- a/Python/etc/jabber/key.pem
+++ b/Python/etc/jabber/key.pem
@ -1,3 +1,3 @@
 info["owner"] = "jabber"
-info["perms"] = 0600
+info["mode"] = 0600
 print file("/etc/crans/secrets/jabber-key.pem").read()
--- a/Python/etc/kgb-bot/kgb.conf
+++ b/Python/etc/kgb-bot/kgb.conf
@ -4,7 +4,7 @@ include("secrets")

 info["owner"] = "Debian-kgb"
 info["group"] = "adm"
-info["perms"] = 0660
+info["mode"] = 0660

 header("Configuration du bot KGB\nIl annonce les commits git sur les channels IRC.")

--- a/Python/etc/kgb-ca.conf
+++ b/Python/etc/kgb-ca.conf
@ -4,7 +4,7 @@ include("secrets")

 info["owner"] = "git"
 info["group"] = "bureau"
-info["perms"] = 0660
+info["mode"] = 0660

 header("Pour parler à KGB dans un hook git\nUn membre du CA n'est pas forcément apprenti.")

--- a/Python/etc/kgb-client.conf
+++ b/Python/etc/kgb-client.conf
@ -4,7 +4,7 @@ include("secrets")

 info["owner"] = "git"
 info["group"] = "respbats"
-info["perms"] = 0660
+info["mode"] = 0660

 header("Pour parler à KGB dans un hook git")

--- a/Python/etc/kgb-fortunes.conf
+++ b/Python/etc/kgb-fortunes.conf
@ -4,7 +4,7 @@ include("secrets")

 info["owner"] = "root"
 info["group"] = "respbats"
-info["perms"] = 0660
+info["mode"] = 0660

 header("Pour parler à KGB dans un hook git\n")

--- a/Python/etc/libnss-ldap.conf
+++ b/Python/etc/libnss-ldap.conf
@ -11,7 +11,7 @@ Pour des informations détaillées voir libnss-ldap.conf(5)
 ainsi que /usr/share/libnss-ldap/ldap.conf
 """)

-info["perms"] = 0644
+info["mode"] = 0644

@# +---------------------------------------------------+
@# | Configuration de la communication avec le serveur |
--- a/Python/etc/monit/monitrc
+++ b/Python/etc/monit/monitrc
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0600
+info["mode"] = 0600

 include("secrets")

--- a/Python/etc/monit/services
+++ b/Python/etc/monit/services
@ -6,7 +6,7 @@ include("ip")

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 header()
 import sys
--- a/Python/etc/network/interfaces
+++ b/Python/etc/network/interfaces
@ -5,7 +5,7 @@ include("arpwatch")

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 import config.dns

--- a/Python/etc/nginx/sites-available/status
+++ b/Python/etc/nginx/sites-available/status
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "#"

--- a/Python/etc/nginx/sites-available/tv
+++ b/Python/etc/nginx/sites-available/tv
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "#"

--- a/Python/etc/nslcd.conf
+++ b/Python/etc/nslcd.conf
@ -10,7 +10,7 @@ Fichier de configuration pour libnslcd.
 Pour des informations détaillées voir nslcd.conf(5)
 """)

-info["perms"] = 0600
+info["mode"] = 0600

@# +---------------------------------------------------+
@# |            Configuration du démon nslcd           |
--- a/Python/etc/ntp.conf
+++ b/Python/etc/ntp.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "#"

--- a/Python/etc/postfix/aliases
+++ b/Python/etc/postfix/aliases
@ -2,7 +2,7 @@ header()

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

@# Fichier d'alias pour postfix
@#
--- a/Python/etc/radvd.conf
+++ b/Python/etc/radvd.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 include("ip")

--- a/Python/etc/ramond.conf
+++ b/Python/etc/ramond.conf
@ -1,6 +1,6 @@
 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 import sys
 sys.path.append('/usr/scripts/gestion')
--- a/Python/etc/rsyncd.conf
+++ b/Python/etc/rsyncd.conf
@ -4,7 +4,7 @@ include("secrets")
 include("ip")
 include("backups")

-info["perms"] = 0644
+info["mode"] = 0644
 header("Fichier de configuration de rsync")

@# GLOBAL OPTIONS
--- a/Python/etc/rsyslog.d/51-pgsql.conf
+++ b/Python/etc/rsyslog.d/51-pgsql.conf
@ -9,7 +9,7 @@ Fichier de configuration pour rsyslog-pgsql.
 Pour des informations détaillées, utilisez google.
 """)

-info["perms"] = 0640
+info["mode"] = 0640

 # On désactive le logging en base pgsql pour le moment
 if False:
--- a/Python/etc/sqlgrey/sqlgrey.conf
+++ b/Python/etc/sqlgrey/sqlgrey.conf
@ -1,6 +1,6 @@
 info["owner"] = 'root'
 info["group"] = 'root'
-info["perms"] = 0644
+info["mode"] = 0644

 header()

--- a/Python/etc/sudoers
+++ b/Python/etc/sudoers
@ -1,6 +1,6 @@
 # -*- coding: utf-8; mode: python -*-

-info["perms"] = 0440
+info["mode"] = 0440

 header("Configuration du sudo")
 # Suite du header
--- a/Python/etc/sysctl.conf
+++ b/Python/etc/sysctl.conf
@ -2,7 +2,7 @@

 info["owner"] = "root"
 info["group"] = "root"
-info["perms"] = 0644
+info["mode"] = 0644

 template_ra="""
 net.ipv6.conf.%(If)s.autoconf = 0
--- a/Python/var/local/rpcssh/.ssh/authorized_keys
+++ b/Python/var/local/rpcssh/.ssh/authorized_keys
@ -2,7 +2,7 @@

 info["owner"] = "rpcssh"
 info["group"] = "users"
-info["perms"] = 0644
+info["mode"] = 0644

 comment_start = "#"