From 5ec22438ff24579736d94a4fa831cb3ab015866d Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 16 Aug 2016 19:04:05 -0700
Subject: [PATCH] Make sure mod_ssl_conf exists so it can be parsed

---
 certbot-nginx/certbot_nginx/configurator.py | 4 ++--
 certbot-nginx/tests/boulder-integration.sh  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/certbot-nginx/certbot_nginx/configurator.py b/certbot-nginx/certbot_nginx/configurator.py
index 1a14a3866..0383e0693 100644
--- a/certbot-nginx/certbot_nginx/configurator.py
+++ b/certbot-nginx/certbot_nginx/configurator.py
@@ -117,6 +117,8 @@ class NginxConfigurator(common.Plugin):
         # Make sure configuration is valid
         self.config_test()
 
+        # temp_install must be run before creating the NginxParser
+        temp_install(self.mod_ssl_conf)
         self.parser = parser.NginxParser(
             self.conf('server-root'), self.mod_ssl_conf)
 
@@ -124,8 +126,6 @@ class NginxConfigurator(common.Plugin):
         if self.version is None:
             self.version = self.get_version()
 
-        temp_install(self.mod_ssl_conf)
-
     # Entry point in main.py for installing cert
     def deploy_cert(self, domain, cert_path, key_path,
                     chain_path=None, fullchain_path=None):
diff --git a/certbot-nginx/tests/boulder-integration.sh b/certbot-nginx/tests/boulder-integration.sh
index 58613d86f..bd35aee21 100755
--- a/certbot-nginx/tests/boulder-integration.sh
+++ b/certbot-nginx/tests/boulder-integration.sh
@@ -7,7 +7,6 @@ export PATH="/usr/sbin:$PATH"  # /usr/sbin/nginx
 nginx_root="$root/nginx"
 mkdir $nginx_root
 root="$nginx_root" ./certbot-nginx/tests/boulder-integration.conf.sh > $nginx_root/nginx.conf
-cp certbot-nginx/certbot_nginx/options-ssl-nginx.conf "$root"/conf
 
 killall nginx || true
 nginx -c $nginx_root/nginx.conf