Skip to content
Snippets Groups Projects
Verified Commit 470a8c8c authored by David Beniamine's avatar David Beniamine
Browse files

Several fixes for 3zones

parent 582624e9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
eole/config.eol
+ 1
− 1
View file @ 470a8c8c
{"bareos_dir_name": {"owner": "forced", "val": "amonecole-dir"}, "type_amon": {"owner": "gen_config", "val": "2zones-amonecole-cuques"}, "adresse_ip_eth1_proxy_link": {"owner": "gen_config", "val": "10.20.1.2"}, "activer_ajout_hosts": {"owner": "gen_config", "val": "oui"}, "nom_domaine_local": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "nom_court_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy"}}, "activer_squid_auth": {"owner": "gen_config", "val": "non"}, "bareos_sd_password": {"owner": "forced", "val": "01006d73c6f13edbff49539ea6a50b744c26d4f1380cfad072df4daf"}, "adresse_ip_hosts": {"owner": "gen_config", "val": ["10.20.1.2"]}, "bareos_db_mysql_password": {"owner": "gen_config", "val": "38a0a5ed7180cb6fc3660b4049dc111deecf5e67aed721e839e88536"}, "adresse_ip_fichier_link": {"owner": "gen_config", "val": "10.20.1.3"}, "nom_machine": {"owner": "gen_config", "val": "amonecole"}, "bareos_dir_password": {"owner": "forced", "val": "548c71a8e99ce2452009f2d21d225da30e6f2bba95cb05bfc8cf7b98"}, "ip_haute_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.254"}}, "domaine_messagerie_etab": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "___version___": "2.6.2", "esu_proxy": {"owner": "gen_config", "val": "oui"}, "activer_dhcp": {"owner": "gen_config", "val": "oui"}, "ip_basse_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.20"}}, "activer_tftp": {"owner": "gen_config", "val": "oui"}, "bareos_fd_password": {"owner": "forced", "val": "0d2b71cdcc90c4367dcd47fe16bd7d308b7e22aca4c4fe36014c22e0"}, "nom_plage_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "ecole"}}, "system_mail_to": {"owner": "gen_config", "val": "root@malraux1.plandecuques.fr"}, "eth0_method": {"owner": "gen_config", "val": "dhcp"}, "activer_ead_web": {"owner": "gen_config", "val": "oui"}, "ip_admin_eth0": {"owner": "gen_config", "val": ["192.168.3.208", "193.33.56.228", "84.240.95.168"]}, "cert_type": {"owner": "gen_config", "val": "autosign\u00e9"}, "ip_admin_eth1": {"owner": "gen_config", "val": ["10.20.1.24"]}, "numero_etab": {"owner": "gen_config", "val": "malraux1"}, "nom_long_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy.malraux1.plandecuques.fr"}}, "netmask_admin_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "netmask_admin_eth0": {"owner": {"1": "gen_config", "0": "gen_config", "2": "gen_config"}, "val": {"1": "255.255.255.255", "0": "255.255.255.255", "2": "255.255.255.255"}}, "activer_ftp_anonymous_access": {"owner": "gen_config", "val": "oui"}, "smb_share_model": {"owner": "gen_config", "val": "commun"}, "bareos_db_type": {"owner": "forced", "val": "mysql"}, "esu_proxy_default": {"owner": "forced", "val": "oui"}, "nom_academie": {"owner": "gen_config", "val": "ac-marseille"}, "ip_ssh_eth1": {"owner": "gen_config", "val": ["10.20.1.1"]}, "ip_ssh_eth0": {"owner": "gen_config", "val": ["192.168.3.208", "193.33.56.228", "84.240.95.168", "192.168.3.210"]}, "libelle_etab": {"owner": "gen_config", "val": "malraux1"}, "smb_workgroup": {"owner": "gen_config", "val": "ecole-wg"}, "ftp_anonymous_directory": {"owner": "gen_config", "val": "/var/lib/tftpboot/public"}, "smb_netbios_name": {"owner": "gen_config", "val": "ecole-srv"}, "netmask_ssh_eth0": {"owner": {"1": "gen_config", "0": "gen_config", "3": "gen_config", "2": "gen_config"}, "val": {"1": "255.255.255.255", "0": "255.255.255.255", "3": "255.255.255.255", "2": "255.255.255.255"}}, "netmask_ssh_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "omapi_secret": {"owner": "forced", "val": "42f0707bbf047e86da7fb90aa0752f750503be5899135f2ea6542a34"}, "activer_exim_relay_smtp": {"owner": "gen_config", "val": "non"}, "adresse_ip_eth1": {"owner": "gen_config", "val": "10.20.1.1"}, "adresse_ip_eth2": {"owner": "gen_config", "val": "10.20.2.1"}, "web_url": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "adresse_ip_eth2_proxy_link": {"owner": "gen_config", "val": "10.20.2.2"}, "activer_ead3": {"owner": "gen_config", "val": "oui"}, "nombre_interfaces": {"owner": "gen_config", "val": "2"}, "repertoire_tftp": {"owner": "gen_config", "val": "/var/lib/tftpboot/"}}
\ No newline at end of file
{"bareos_dir_name": {"owner": "forced", "val": "amonecole-dir"}, "admin_eth2": {"owner": "gen_config", "val": "oui"}, "adresse_ip_eth1_proxy_link": {"owner": "gen_config", "val": "10.20.1.2"}, "activer_ajout_hosts": {"owner": "gen_config", "val": "oui"}, "nom_domaine_local": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "nom_court_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy"}}, "activer_squid_auth": {"owner": "gen_config", "val": "non"}, "bareos_sd_password": {"owner": "forced", "val": "01006d73c6f13edbff49539ea6a50b744c26d4f1380cfad072df4daf"}, "adresse_ip_hosts": {"owner": "gen_config", "val": ["10.20.1.2"]}, "bareos_db_mysql_password": {"owner": "gen_config", "val": "38a0a5ed7180cb6fc3660b4049dc111deecf5e67aed721e839e88536"}, "adresse_ip_fichier_link": {"owner": "gen_config", "val": "10.20.1.3"}, "web_url": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "bareos_dir_password": {"owner": "forced", "val": "548c71a8e99ce2452009f2d21d225da30e6f2bba95cb05bfc8cf7b98"}, "ip_haute_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.254"}}, "domaine_messagerie_etab": {"owner": "gen_config", "val": "malraux1.plandecuques.fr"}, "nom_machine_eth1": {"owner": "gen_config", "val": "pedago"}, "nom_machine_eth2": {"owner": "gen_config", "val": "admin"}, "adresse_netmask_eth2": {"owner": "gen_config", "val": "255.255.255.0"}, "___version___": "2.6.2", "dansguardian_eth2": {"owner": "gen_config", "val": "2"}, "esu_proxy": {"owner": "gen_config", "val": "oui"}, "type_amon": {"owner": "gen_config", "val": "3zones-amonecole-cuques"}, "activer_dhcp": {"owner": "gen_config", "val": "oui"}, "ip_basse_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "10.20.1.20"}}, "activer_tftp": {"owner": "gen_config", "val": "oui"}, "bareos_fd_password": {"owner": "forced", "val": "0d2b71cdcc90c4367dcd47fe16bd7d308b7e22aca4c4fe36014c22e0"}, "nom_plage_dhcp": {"owner": {"0": "gen_config"}, "val": {"0": "ecole"}}, "system_mail_to": {"owner": "gen_config", "val": "root@malraux1.plandecuques.fr"}, "eth0_method": {"owner": "gen_config", "val": "dhcp"}, "activer_ead_web": {"owner": "gen_config", "val": "oui"}, "cert_type": {"owner": "gen_config", "val": "autosign\u00e9"}, "ip_admin_eth0": {"owner": "gen_config", "val": ["192.168.3.208", "193.33.56.228", "84.240.95.168"]}, "ip_admin_eth1": {"owner": "gen_config", "val": ["10.20.1.24"]}, "ip_admin_eth2": {"owner": "gen_config", "val": ["10.21.1.1"]}, "nom_long_hosts": {"owner": {"0": "gen_config"}, "val": {"0": "dnsproxy.malraux1.plandecuques.fr"}}, "ssh_eth2": {"owner": "gen_config", "val": "oui"}, "netmask_admin_eth0": {"owner": {"1": "gen_config", "0": "gen_config", "2": "gen_config"}, "val": {"1": "255.255.255.255", "0": "255.255.255.255", "2": "255.255.255.255"}}, "netmask_admin_eth2": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "numero_etab": {"owner": "gen_config", "val": "malraux1"}, "activer_ftp_anonymous_access": {"owner": "gen_config", "val": "oui"}, "smb_share_model": {"owner": "gen_config", "val": "commun"}, "bareos_db_type": {"owner": "forced", "val": "mysql"}, "esu_proxy_default": {"owner": "forced", "val": "oui"}, "ip_ssh_eth2": {"owner": "gen_config", "val": ["10.21.1.1"]}, "ip_ssh_eth1": {"owner": "gen_config", "val": ["10.20.1.1"]}, "ip_ssh_eth0": {"owner": "gen_config", "val": ["192.168.3.208", "193.33.56.228", "84.240.95.168", "192.168.3.210"]}, "libelle_etab": {"owner": "gen_config", "val": "malraux1"}, "netmask_admin_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "smb_workgroup": {"owner": "gen_config", "val": "ecole-wg"}, "ftp_anonymous_directory": {"owner": "gen_config", "val": "/var/lib/tftpboot/public"}, "smb_netbios_name": {"owner": "gen_config", "val": "ecole-srv"}, "netmask_ssh_eth2": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "netmask_ssh_eth0": {"owner": {"1": "gen_config", "0": "gen_config", "3": "gen_config", "2": "gen_config"}, "val": {"1": "255.255.255.255", "0": "255.255.255.255", "3": "255.255.255.255", "2": "255.255.255.255"}}, "netmask_ssh_eth1": {"owner": {"0": "gen_config"}, "val": {"0": "255.255.255.255"}}, "nom_academie": {"owner": "gen_config", "val": "ac-marseille"}, "omapi_secret": {"owner": "forced", "val": "42f0707bbf047e86da7fb90aa0752f750503be5899135f2ea6542a34"}, "activer_exim_relay_smtp": {"owner": "gen_config", "val": "non"}, "adresse_ip_eth1": {"owner": "gen_config", "val": "10.20.1.1"}, "adresse_ip_eth2": {"owner": "gen_config", "val": "10.21.1.1"}, "nom_machine": {"owner": "gen_config", "val": "amonecole"}, "adresse_ip_eth2_proxy_link": {"owner": "gen_config", "val": "10.21.1.2"}, "activer_ead3": {"owner": "gen_config", "val": "oui"}, "nombre_interfaces": {"owner": "gen_config", "val": "3"}, "repertoire_tftp": {"owner": "gen_config", "val": "/var/lib/tftpboot/"}}
\ No newline at end of file
eole/creole/acng.conf
+ 1
− 1
View file @ 470a8c8c
......@@ -24,7 +24,7 @@ Port:%%getVar('apt_cacher_port', 3142)
#
# Default: not set, will listen on all interfaces and protocols
#
%set %%bindaddresses = "localhost" + ' ' + %%getVar('adresse_ip_eth1', '10.0.0.1')
%set %%bindaddresses = "localhost" + ' ' + %%getVar('adresse_ip_eth1', '10.0.0.1') + ' ' + %%getVar('adresse_ip_eth2', '10.1.0.1')
%if %%getVar('mode_conteneur_actif', 'non') == 'oui'
%set %%bindaddresses += ' ' + %%getVar('adresse_ip_br0', '192.0.2.1')
%end if
......
eole/era/3zones-amonecole-cuques.xml
+ 3
− 3
View file @ 470a8c8c
......@@ -54,7 +54,7 @@
</descendantes>
</flux>
<flux zoneA="bastion" zoneB="admin">
<flux zoneA="bastion" zoneB="pedago">
<montantes default_policy="0">
<directive service="apt-cacher-ng" priority="40" action="2" attrs="0" mark_operator="None" mark_value="" src_inv="0" dest_inv="0" serv_inv="0" libelle="pas de description" ipsec="0" accept="0">
<source name="admin"/>
......@@ -68,7 +68,7 @@
<montantes default_policy="0">
<directive service="registry" priority="41" action="2" attrs="0" src_inv="0" dest_inv="0" serv_inv="0" libelle="pas de description" ipsec="0" accept="0">
<source name="admin"/>
<destination name="partage_eth2"/>
<destination name="partage_eth1"/>
</directive>
</montantes>
<descendantes default_policy="1">
......@@ -78,7 +78,7 @@
<montantes default_policy="0">
<directive service="cups" priority="42" action="2" attrs="0" src_inv="0" dest_inv="0" serv_inv="0" libelle="pas de description" ipsec="0" accept="0">
<source name="admin"/>
<destination name="partage_eth2"/>
<destination name="partage_eth1"/>
</directive>
</montantes>
<descendantes default_policy="1">
......
eole/era/3zones-amonecole.xml
+ 8
− 8
View file @ 470a8c8c
......@@ -857,27 +857,27 @@
</directive>
<directive accept="0" action="2" attrs="17" dest_inv="0" ipsec="0" libelle="interface web CUPS" priority="30" serv_inv="0" service="cups" src_inv="0" tag="activer_cups1">
<source name="admin_admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="0" dest_inv="0" ipsec="0" libelle="Controle VNC" priority="31" serv_inv="0" service="scribe-controlevnc" src_inv="0">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="17" dest_inv="0" ipsec="0" libelle="Controle VNC" priority="32" serv_inv="0" service="ftp" src_inv="0" tag="activer_proftpd">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="0" dest_inv="0" ipsec="0" libelle="Controle VNC" priority="33" serv_inv="0" service="samba" src_inv="0">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="0" dest_inv="0" ipsec="0" libelle="Controle VNC" priority="34" serv_inv="0" service="samba" src_inv="0">
<source name="admin" />
<destination name="partage_eth2_broadcast" />
<destination name="partage_eth1_broadcast" />
</directive>
<directive accept="0" action="2" attrs="0" dest_inv="0" ipsec="0" libelle="Autorise le ping vers le conteneur" priority="35" serv_inv="0" service="echo-request" src_inv="0">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="0" dest_inv="0" ipsec="0" libelle="Autorise le ping vers le conteneur" priority="36" serv_inv="0" service="echo-request" src_inv="0">
<source name="admin" />
......@@ -885,7 +885,7 @@
</directive>
<directive accept="0" action="2" attrs="17" dest_inv="0" ipsec="0" libelle="Autoriser l'accès &#224; Gaspacho" priority="37" serv_inv="0" service="gaspacho" src_inv="0" tag="Gaspachoeth2">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
<directive accept="0" action="2" attrs="17" dest_inv="0" ipsec="0" libelle="Open Eclair ports on AmonEcole" priority="38" serv_inv="0" service="amonecole-eclair" src_inv="0" tag="activer_eclair_amonecole">
<source name="admin" />
......@@ -893,7 +893,7 @@
</directive>
<directive accept="0" action="2" attrs="17" dest_inv="0" ipsec="0" libelle="Open Gaspacho and TFTPD for Eclair on AmonEcole" priority="39" serv_inv="0" service="amonecole-eclair-partage" src_inv="0" tag="activer_eclair_amonecole">
<source name="admin" />
<destination name="partage_eth2" />
<destination name="partage_eth1" />
</directive>
</montantes>
<descendantes default_policy="1">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment