Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

provisioning_example.sh

@@ -96,6 +96,7 @@ cucchiaiata-cli v1.setting.servermodel.create --servermodel_name unbound --appli
 cucchiaiata-cli v1.setting.servermodel.create --servermodel_name aca --applicationservices_name openssh-server
 cucchiaiata-cli v1.setting.servermodel.create --servermodel_name etab1 --parents_name aca
 cucchiaiata-cli v1.setting.servermodel.create --servermodel_name unbound_etab1 --parents_name etab1 unbound
+cucchiaiata-cli v1.setting.servermodel.create --servermodel_name nsd_etab1 --parents_name etab1  --applicationservices_name nsd
 
 # configuration
 
@@ -106,18 +107,13 @@ cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
 
 # Servermodel unbound
 S=$(get_id "cucchiaiata-cli v1.setting.session.servermodel.start --servermodel_name unbound")
-cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_server.unbound_role autorité \
-                                                               --configuration.dns_server.unbound_allowed_client_cidr 192.168.0.0/24 \
-                                                               --configuration.dns_zone.unbound_local_zones cadoles.com
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_resolver.unbound_allowed_client_cidr 192.168.0.0/24
 cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
 
 # Servermodel unbound_etab1
 S=$(get_id "cucchiaiata-cli v1.setting.session.servermodel.start --servermodel_name unbound_etab1")
-cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace unbound
-cucchiaiata-cli v1.setting.session.configure --session_id "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi \
-                                                               --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.0.25 \
-                                                               --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME \
-                                                               --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_resolver.unbound_forward_zones.unbound_forward_zones cadoles.com \
+	                                                       --configuration.dns_resolver.unbound_forward_zones.unbound_forward_addresses 0 192.168.0.151
 cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
 
 # Server
@@ -134,13 +130,31 @@ cucchiaiata-cli v1.infra.server.create --server_name dns.cadoles.com \
                                        --cluster_name hapy.ac-test.fr \
                                        --zones_name internet \
                                        --servermodel_name unbound_etab1
+cucchiaiata-cli v1.infra.server.create --server_name nsd.cadoles.com \
+                                       --site_name etab1 \
+                                       --cluster_name hapy.ac-test.fr \
+                                       --zones_name internet \
+                                       --servermodel_name nsd_etab1
 # configuration
 sleep 1
+S=$(get_id "cucchiaiata-cli v1.setting.session.server.start --server nsd.cadoles.com")
+#FIXME IP en dure ?
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_server.nsd_allowed_client_cidr 192.168.0.150/32 \
+                                                               --configuration.dns_zone.nsd_zones cadoles.com
+cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace nsd
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --nsd.nsd_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi \
+                                                               --nsd.nsd_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.0.25 \
+                                                               --nsd.nsd_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME \
+                                                               --nsd.nsd_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com
+cucchiaiata-cli v1.setting.session.validate --session_id $S
+cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
+
 S=$(get_id "cucchiaiata-cli v1.setting.session.server.start --server dns.cadoles.com")
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_resolver.unbound_default_forwards 192.168.0.1
+cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.dns_resolver.unbound_local_authority "nsd.cadoles.com"
 cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace opennebula
 cucchiaiata-cli v1.setting.session.configure --session_id "$S" --opennebula.cpu 0.2 \
-                                                               --opennebula.vcpu 2 \
-                                                               --opennebula.memory 2048
+                                                               --opennebula.vcpu 2
 cucchiaiata-cli v1.setting.session.validate --session_id $S
 cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
 
@@ -151,6 +165,6 @@ cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save
 # Generate configuration
 cucchiaiata-cli v1.infra.cluster.deploy --cluster_name hapy.ac-test.fr
 cucchiaiata-cli v1.infra.zone.deploy --zone_name internet
+cucchiaiata-cli v1.infra.server.deploy --server_name nsd.cadoles.com
 cucchiaiata-cli v1.infra.server.deploy --server_name dns.cadoles.com
-
 echo "fin"

setup.py

@@ -3,6 +3,6 @@ from setuptools import setup, find_packages
 setup(
     name='cucchiaiata',
     version='0.1',
-    packages=['cucchiaiata' ],
+    packages=['cucchiaiata', 'cucchiaiata.output'],
     package_dir={"": "src"},
     )

src/cucchiaiata/output/interactive.py

@@ -33,7 +33,7 @@ def setting_pki_openssh_client(dico, config):
                 add = new - current
                 modify = [key for key in new if key in current and current_data[key] != new_data[key]]
                 if add or modify:
-                    print(f'\n\nModifications suggérées de la section "Host {hostname}"du fichier "{config_file}" :')
+                    print(f'\n\nModifications suggérées de la section "Host {hostname}" du fichier "{config_file}" :')
                     for line in add:
                         value = new_data[line]
                         if isinstance(value, list):
@@ -43,17 +43,21 @@ def setting_pki_openssh_client(dico, config):
                         value = new_data[line]
                         if isinstance(value, list):
                             value = ','.join(value)
-                        print(f'  - modifier "{line} {value}"')
+                        print(f'  - modifier "{line} {current_data[line]}" en "{line} {value}"')
                 print('\n')
     else:
-        print(f'\n\nIl faudrait créer le fichier "{config_file}" :')
-        print(f'Host {hostname}')
+        if not isdir(config_dir):
+            makedirs(config_dir, 0o700)
+        fh = os_open(config_file, O_WRONLY | O_CREAT, 0o400)
+        truncate(fh, 0)
+        write(fh, f'Host {hostname}\n'.encode())
         for key, value in new_data.items():
             if key == 'hostname':
                 continue
-            print(f'    {key} {value}')
-    if not isdir(config_dir):
-        makedirs(config_dir, 0o700)
+            if isinstance(value, list):
+                value = ','.join(value)
+            write(fh, f'    {key} {value}\n'.encode())
+        close(fh)
     fh = os_open(f'{identityfile}.pub', O_WRONLY | O_CREAT, 0o400)
     truncate(fh, 0)
     write(fh, dico['certificate'].encode())