change to mode prod (rename conf file)

vh_le.conf

@@ -1,19 +1,40 @@
+# the main domain
 domain_main = "www.hadoly.fr"
 
+# list of TLDs used to determine the secondary domains
 tld = ['fr', 'org']
+# domain's base name used to determine the secondary domains 
 name = "hadoly"
+# list of subdomains used to determine the secondary domains 
 sub = ['www']
 
+# the IPv6
 ip6_back = "2001:0912:3064:XXXX"
 
+# the main zone record without extension
 main_zone = "merlin.hadoly"
 
+
+# path for Let'sEncrypt certificate
+le_certificate_folder = "/etc/nginx/sites"
+
+# path for ACME configuration
+acme_folder = "/etc/acme"
+
+
+# the template Vhost file
 template_nginx_vhost = "./nginx_vhost_template"
+
+# the temporary template Vhost file for Let's Encrypt
 template_le_nginx_vhost = "./nginx_le_vhost_template"
+
+# the template file for ACME config
 template_acme_conf = "./acme_config_template"
-available_path = "./available"
-enabled_path = "./enabled"
 
-le_certificate_folder = "./sites"
+
-acme_folder = "./acme"
+# path to sites-available
+available_path = "/etc/nginx/sites-available"
+
+# path to sites-enabled
+enabled_path = "/etc/nginx/sites-enabled"
 

vh_le.py

@@ -419,7 +419,7 @@ if step[9]:
     print_info("\n++++++ STEP 9 : update the Nginx enable final configuration file ++++++")
 
     if generate_file(c['template_nginx_vhost'],
-                     c['available_path'] + "/" + c['domain_main']+"_final", #TODO remove _final
+                     c['available_path'] + "/" + c['domain_main'],
                      {"main_domain": c['domain_main'],
                       "second_domains": ' '.join(domains),
                       "ip6_back": c['ip6_back']}) == False:

vh_le_final.conf

@@ -1,40 +0,0 @@
-# the main domain
-domain_main = "www.hadoly.fr"
-
-# list of TLDs used to determine the secondary domains
-tld = ['fr', 'org']
-# domain's base name used to determine the secondary domains 
-name = "hadoly"
-# list of subdomains used to determine the secondary domains 
-sub = ['www']
-
-# the IPv6
-ip6_back = "2001:0912:3064:XXXX"
-
-# the main zone record without extension
-main_zone = "merlin.hadoly"
-
-
-# path for Let'sEncrypt certificate
-le_certificate_folder = "/etc/nginx/sites"
-
-# path for ACME configuration
-acme_folder = "/etc/acme"
-
-
-# the template Vhost file
-template_nginx_vhost = "./nginx_vhost_template"
-
-# the temporary template Vhost file for Let's Encrypt
-template_le_nginx_vhost = "./nginx_le_vhost_template"
-
-# the template file for ACME config
-template_acme_conf = "./acme_config_template"
-
-
-# path to sites-available
-available_path = "/etc/nginx/sites-available"
-
-# path to sites-enabled
-enabled_path = "/etc/nginx/sites-enabled"
-

vh_le_test.conf

@@ -0,0 +1,19 @@
+domain_main = "www.hadoly.fr"
+
+tld = ['fr', 'org']
+name = "hadoly"
+sub = ['www']
+
+ip6_back = "2001:0912:3064:XXXX"
+
+main_zone = "merlin.hadoly"
+
+template_nginx_vhost = "./nginx_vhost_template"
+template_le_nginx_vhost = "./nginx_le_vhost_template"
+template_acme_conf = "./acme_config_template"
+available_path = "./available"
+enabled_path = "./enabled"
+
+le_certificate_folder = "./sites"
+acme_folder = "./acme"
+