Nginx reversion (#5299)

The reason for this PR is many bug fixes in the nginx plugin for changes we haven't released yet are included in #5220 which may not make our next release. If it doesn't, we will (mostly) revert the nginx plugin back to its previous state to avoid releasing these bugs and will revert this PR after the release.

* Revert "Nginx IPv6 support (#5178)"

This reverts commit 68e37b03c821560e7f316d260f8da97ef3e2087c.

* Revert "Fix bug that stopped nginx from finding new server block for redirect (#5198)"

This reverts commit e2ab940ac03ffe4f2cf7c478a1597c0b52f14bc4.

* Revert "Nginx creates a vhost block if no matching block is found (#5153)"

This reverts commit 95a7d4585619d612ff28ac24dac4faefaee59e72.

1 files changed, 11 insertions, 45 deletions

diff --git a/certbot-nginx/certbot_nginx/tests/parser_test.py b/certbot-nginx/certbot_nginx/tests/parser_test.py
index ca5de7ff6..e655bc3e3 100644
--- a/certbot-nginx/certbot_nginx/tests/parser_test.py
+++ b/certbot-nginx/certbot_nginx/tests/parser_test.py
@@ -50,9 +50,7 @@ class NginxParserTest(util.NginxTest): #pylint: disable=too-many-public-methods
                                'sites-enabled/example.com',
                                'sites-enabled/migration.com',
                                'sites-enabled/sslon.com',
-                               'sites-enabled/globalssl.com',
-                               'sites-enabled/ipv6.com',
-                               'sites-enabled/ipv6ssl.com']]),
+                               'sites-enabled/globalssl.com']]),
                          set(nparser.parsed.keys()))
         self.assertEqual([['server_name', 'somename', 'alias', 'another.alias']],
                          nparser.parsed[nparser.abs_path('server.conf')])
@@ -76,7 +74,7 @@ class NginxParserTest(util.NginxTest): #pylint: disable=too-many-public-methods
         parsed = nparser._parse_files(nparser.abs_path(
             'sites-enabled/example.com.test'))
         self.assertEqual(3, len(glob.glob(nparser.abs_path('*.test'))))
-        self.assertEqual(7, len(
+        self.assertEqual(5, len(
             glob.glob(nparser.abs_path('sites-enabled/*.test'))))
         self.assertEqual([[['server'], [['listen', '69.50.225.155:9000'],
                                         ['listen', '127.0.0.1'],
@@ -112,8 +110,7 @@ class NginxParserTest(util.NginxTest): #pylint: disable=too-many-public-methods
         vhosts = nparser.get_vhosts()
 
         vhost = obj.VirtualHost(nparser.abs_path('sites-enabled/globalssl.com'),
-                                [obj.Addr('4.8.2.6', '57', True, False,
-                                          False, False)],
+                                [obj.Addr('4.8.2.6', '57', True, False)],
                                 True, True, set(['globalssl.com']), [], [0])
 
         globalssl_com = [x for x in vhosts if 'globalssl.com' in x.filep][0]
@@ -124,42 +121,34 @@ class NginxParserTest(util.NginxTest): #pylint: disable=too-many-public-methods
         vhosts = nparser.get_vhosts()
 
         vhost1 = obj.VirtualHost(nparser.abs_path('nginx.conf'),
-                                 [obj.Addr('', '8080', False, False,
-                                           False, False)],
+                                 [obj.Addr('', '8080', False, False)],
                                  False, True,
                                  set(['localhost',
                                       r'~^(www\.)?(example|bar)\.']),
                                  [], [10, 1, 9])
         vhost2 = obj.VirtualHost(nparser.abs_path('nginx.conf'),
-                                 [obj.Addr('somename', '8080', False, False,
-                                           False, False),
-                                  obj.Addr('', '8000', False, False,
-                                           False, False)],
+                                 [obj.Addr('somename', '8080', False, False),
+                                  obj.Addr('', '8000', False, False)],
                                  False, True,
                                  set(['somename', 'another.alias', 'alias']),
                                  [], [10, 1, 12])
         vhost3 = obj.VirtualHost(nparser.abs_path('sites-enabled/example.com'),
                                  [obj.Addr('69.50.225.155', '9000',
-                                           False, False, False, False),
-                                  obj.Addr('127.0.0.1', '', False, False,
-                                           False, False)],
+                                           False, False),
+                                  obj.Addr('127.0.0.1', '', False, False)],
                                  False, True,
                                  set(['.example.com', 'example.*']), [], [0])
         vhost4 = obj.VirtualHost(nparser.abs_path('sites-enabled/default'),
-                                 [obj.Addr('myhost', '', False, True,
-                                           False, False),
-                                  obj.Addr('otherhost', '', False, True,
-                                           False, False)],
+                                 [obj.Addr('myhost', '', False, True)],
                                  False, True, set(['www.example.org']),
                                  [], [0])
         vhost5 = obj.VirtualHost(nparser.abs_path('foo.conf'),
-                                 [obj.Addr('*', '80', True, True,
-                                           False, False)],
+                                 [obj.Addr('*', '80', True, True)],
                                  True, True, set(['*.www.foo.com',
                                                   '*.www.example.com']),
                                  [], [2, 1, 0])
 
-        self.assertEqual(12, len(vhosts))
+        self.assertEqual(10, len(vhosts))
         example_com = [x for x in vhosts if 'example.com' in x.filep][0]
         self.assertEqual(vhost3, example_com)
         default = [x for x in vhosts if 'default' in x.filep][0]
@@ -406,29 +395,6 @@ class NginxParserTest(util.NginxTest): #pylint: disable=too-many-public-methods
         ])
         self.assertTrue(server['ssl'])
 
-    def test_create_new_vhost_from_default(self):
-        nparser = parser.NginxParser(self.config_path)
-
-        vhosts = nparser.get_vhosts()
-        default = [x for x in vhosts if 'default' in x.filep][0]
-        new_vhost = nparser.create_new_vhost_from_default(default)
-        nparser.filedump(ext='')
-
-        # check properties of new vhost
-        self.assertFalse(next(iter(new_vhost.addrs)).default)
-        self.assertNotEqual(new_vhost.path, default.path)
-
-        # check that things are written to file correctly
-        new_nparser = parser.NginxParser(self.config_path)
-        new_vhosts = new_nparser.get_vhosts()
-        new_defaults = [x for x in new_vhosts if 'default' in x.filep]
-        self.assertEqual(len(new_defaults), 2)
-        new_vhost_parsed = new_defaults[1]
-        self.assertFalse(next(iter(new_vhost_parsed.addrs)).default)
-        self.assertEqual(next(iter(default.names)), next(iter(new_vhost_parsed.names)))
-        self.assertEqual(len(default.raw), len(new_vhost_parsed.raw))
-        self.assertTrue(next(iter(default.addrs)).super_eq(next(iter(new_vhost_parsed.addrs))))
-
 
 if __name__ == "__main__":
     unittest.main()  # pragma: no cover