crans/crans_bcfg2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[global] Adieu squeeze, oie, lapin, gordon…

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2014-03-19 01:18:31 +01:00
parent bfd7244a43
commit 82611d64cb
10 changed files with 8 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Base/needed.xml
View file

@ -51,12 +51,7 @@
</Group>
<Group name="domu">
<Group name="wheezy">
<Package name="linux-image-amd64"/>
</Group>
<Group name="squeeze">
<Package name="linux-image-xen-amd64"/>
</Group>
</Group>
</Base>

5
Base/utils.xml
View file

@ -1,12 +1,7 @@
<Base>
<Group name="crans">
<!-- Les paquets utiles pour l'utilisation de tous les jours -->
<Group name="squeeze">
<Package name="emacs23-nox"/>
</Group>
<Group name="wheezy">
<Package name="emacs23-nox"/>
</Group>
<Package name="darcs"/>
<Package name="di"/>
<Package name="emacs-goodies-el"/>

2
Bundler/firewall.xml
View file

@ -2,7 +2,5 @@
<Path name="/etc/init.d/firewall"/>
<Python name="/etc/cron.d/firewall"/>
<Action name="link-firewall"/>
<Group name="squeeze" negate="true">
<Package name="ipset" />
</Group>
</Bundle>

5
Bundler/home.xml
View file

@ -4,12 +4,7 @@
<Python name="/etc/auto.master"/>
<Path name="/etc/auto.home"/>
<Path name="/etc/default/autofs"/>
<Group name="squeeze" negate="true">
<Package name="autofs"/>
</Group>
<Group name="squeeze">
<Package name="autofs5"/>
</Group>
<Service name="autofs"/>
</Group>
</Group>

4
Bundler/rpc.xml
View file

@ -3,8 +3,4 @@
<Package name="rpcbind"/>
<Service name="rpcbind"/>
</Group>
<Group name="squeeze">
<Package name="portmap"/>
<Service name="portmap"/>
</Group>
</Bundle>

51
Metadata/groups.xml
View file

@ -116,18 +116,6 @@
<Group name="connexion-secours-test"/>
</Group>
<Group name="gordon"
profile="true">
<Group name="crans-squeeze"/>
<!--
<Group name="firewall"/>
<Group name="dnssec-validation"/>
<Group name="dns-recursif"/>
<Group name="secondary-ntp-server"/>
<Group name="wifi-auth"/>
-->
</Group>
<Group name="malloc" profile="true">
<Group name="crans-wheezy"/>
<Group name="iscsi"/>
@ -344,30 +332,6 @@
<Group name="ident-daemon"/>
</Group>
<Group name="canard"
profile="true">
<Group name="mumudvb"/>
<Group name="crans-squeeze"/>
</Group>
<Group name="oie"
profile="true">
<Group name="mumudvb"/>
<Group name="crans-squeeze"/>
</Group>
<Group name="lapin"
profile="true">
<Group name="mumudvb"/>
<Group name="crans-squeeze"/>
</Group>
<Group name="dindon"
profile="true">
<Group name="mumudvb"/>
<Group name="crans-squeeze"/>
</Group>
<Group name="cochon"
profile="true">
<Group name="mumudvb"/>
@ -502,7 +466,6 @@
<Group name="debian" category="linux-distribution"/>
<Group name="sid" category="debian-version"/>
<Group name="squeeze" category="debian-version"/>
<Group name="wheezy" category="debian-version"/>
<Group name="non-free"/>
@ -576,14 +539,6 @@
<Group name="generate"/>
</Group>
<Group name="crans-squeeze" public="true">
<!-- profile minimal pour squeeze -->
<Group name="crans-common"/>
<Group name="squeeze"/>
<Group name="ntp"/>
<Group name="console-setup"/>
</Group>
<Group name="crans-wheezy" public="true">
<!-- profile minimal pour wheezy -->
<Group name="crans-common"/>
@ -612,12 +567,6 @@
<Bundle name="iscsi-update"/>
</Group>
<Group name="crans-nfs-squeeze">
<Group name="crans-nfs"/>
<Group name="squeeze"/>
</Group>
<Group name="crans-nfs-wheezy">
<Group name="crans-nfs"/>
<Group name="wheezy"/>

38
Packages/sources.xml
View file

@ -37,42 +37,4 @@
<Arch>amd64</Arch>
</Source>
</Group>
<Group name="squeeze">
<Source type="apt"
url="http://ftp.adm.crans.org/debian"
version="squeeze">
<Component>main</Component>
<Component>contrib</Component>
<Component>non-free</Component>
<Arch>i386</Arch>
<Arch>amd64</Arch>
</Source>
<Source type="apt"
url="http://ftp.adm.crans.org/debian-security"
version="squeeze/updates">
<Component>main</Component>
<Component>contrib</Component>
<Component>non-free</Component>
<Arch>i386</Arch>
<Arch>amd64</Arch>
</Source>
<Source type="apt"
url="http://ftp.adm.crans.org/debian"
version="squeeze-updates">
<Component>main</Component>
<Component>contrib</Component>
<Component>non-free</Component>
<Arch>i386</Arch>
<Arch>amd64</Arch>
</Source>
<Source type="apt"
url="http://ftp.adm.crans.org/custom"
version="squeeze">
<Component>main</Component>
<Component>contrib</Component>
<Component>non-free</Component>
<Arch>i386</Arch>
<Arch>amd64</Arch>
</Source>
</Group>
</Sources>

11
Python/etc/default/monit
View file

@ -8,7 +8,6 @@ info["perms"] = 0644
header('Demarrage de monit')
# Pour wheezy et au-delà
if not has('squeeze'):
print """
# On lance monit automatiquement
@ -17,13 +16,3 @@ START="yes"
MONIT_OPTS="-d 60"
"""
else:
print """
# on lance monit au demarrage
startup=1
# intervale de verification
CHECK_INTERVALS=60
"""

6
Python/etc/monit/services
View file

@ -223,7 +223,7 @@ service("openvpn-freebox",
init="openvpn",
extra=["depends on openvpn-komaz"])
pg_version = '8.4' if has('squeeze') else '9.1'
pg_version = '9.1'
service("pgsql-server",
name="postgresql",
init="postgresql",
@ -354,9 +354,7 @@ for line in metadata.Probes["fstab_local"].splitlines():
comment("partition %s" % mntpoint)
# Permission attendue
perm = '660'
if not has('squeeze'):
perm = '1' + perm
perm = '1660'
# on vérifie le filesystem directement pour les volumes lvm
if fs.startswith('/dev/mapper'):

3
Python/etc/ssh/sshd_config
View file

@ -65,9 +65,6 @@ header("Configuration du serveur ssh")
%X11Forwarding yesno(has("users") or has("2B"))
@X11DisplayOffset 10
if has("squeeze"):
@PrintMotd yes
else:
@PrintMotd no
@PrintLastLog yes
@TCPKeepAlive yes