Commit graph

420 commits

Author SHA1 Message Date
Sebastian Bögl
b5bd330bd9 add vhost test cases containing IPv6 addresses
The two added vhost configuration files should test, whether a reversed
order, i.e. first an IPv6 entry followed by an IPv4 one, or an IPv6
adress without a given port works correctly.
2016-02-15 23:13:28 +01:00
Robert Xiao
a819cdcd9a Support system-default Apache on OS X. Tested on Yosemite (10.10). 2016-02-11 17:09:50 -05:00
Brad Warren
8f283924cd Add --apache-ctl as deprecated arg 2016-02-09 15:43:51 -08:00
Brad Warren
8a5d40fc35 Make add_deprecated_argument more readable 2016-02-09 15:41:42 -08:00
Brad Warren
8ddebe3d12 Create tests to prevent future regressions 2016-02-01 18:21:02 -08:00
Brad Warren
3c34fd80c7 Change enable_mod order 2016-02-01 18:09:47 -08:00
Roy Wellington Ⅳ
9c28364477 Make exception syntax Python 3 compatible.
Translate all except and raise statements that are in the old form to
the Python 3 compatible format.
2016-01-30 19:53:50 -08:00
bmw
609776a709 Revert "Revert "Revert "Temporarily disable Apache 2.2 support""" 2016-01-29 17:30:27 -08:00
bmw
33e0c8fe74 Merge pull request #2286 from SwartzCr/issue_1991
write servername/serveralias if copying a generic vhost
2016-01-29 17:29:10 -08:00
Noah Swartz
36e2c9a992 remove test hackery 2016-01-29 17:11:05 -08:00
Noah Swartz
7d63a0c8df fix stupid broken tests 2016-01-29 16:44:22 -08:00
Noah Swartz
7215376ff9 update server list with added names 2016-01-29 16:09:19 -08:00
Noah Swartz
a6d0410f4e remove old TODO 2016-01-29 15:30:23 -08:00
Noah Swartz
fd9fa1b965 Merge pull request #2284 from SwartzCr/centos_sslcompression
make different options ssl conf for centos
2016-01-29 13:40:52 -08:00
Peter Eckersley
eb59804f76 Merge pull request #2314 from letsencrypt/rpm-apache22
Small Apache 2.2 fixes
2016-01-29 13:34:58 -08:00
Brad Warren
50e2f769c0 loc--, readability++ 2016-01-29 12:54:34 -08:00
Noah Swartz
b7c94bb297 don't continue if there's no vhost 2016-01-28 16:48:12 -08:00
Noah Swartz
5f50d698ee fix var name 2016-01-28 16:26:44 -08:00
Noah Swartz
69ac8c6cfa add servername/alias for all vhosts 2016-01-28 16:24:56 -08:00
Noah Swartz
3e5b89daa5 remove save params 2016-01-28 15:54:02 -08:00
Noah Swartz
1417dc43cd save ssl directives 2016-01-28 15:38:14 -08:00
Noah Swartz
e7507e5354 don't double write servers 2016-01-28 14:53:47 -08:00
Noah Swartz
ff98ae3f22 remove is_generic always write target_name 2016-01-28 13:25:10 -08:00
bmw
7c6678b873 Revert "Revert "Temporarily disable Apache 2.2 support"" 2016-01-27 10:43:56 -08:00
Brad Warren
870a743ce1 Detect * and _default_ conflict 2016-01-26 18:09:55 -08:00
Noah Swartz
4bae5b432c fix tests 2016-01-26 13:53:43 -08:00
Noah Swartz
80ce6e2942 initial servername write test 2016-01-26 13:42:56 -08:00
Brad Warren
8ba59406ad When in doubt, use the config root 2016-01-26 11:40:44 -08:00
Noah Swartz
1a14b4c8d5 fix mapping issue 2016-01-26 10:39:54 -08:00
Noah Swartz
1a12aa01b4 make different options ssl conf for centos 2016-01-26 10:17:34 -08:00
bmw
90c7a73146 Merge pull request #2078 from letsencrypt/non-interactive
Implement non-interactive mode for the client.
2016-01-25 18:51:56 -08:00
Noah Swartz
5192fa36ab move save command up to tls_sni 2016-01-22 11:47:49 -08:00
Noah Swartz
b75b887a83 fixed linting issues 2016-01-22 10:03:29 -08:00
Noah Swartz
0802ade04e fix apache 2.2 2016-01-21 15:59:30 -08:00
Noah Swartz
bbf2896572 Merge pull request #2201 from letsencrypt/revert-2171-kill-22
Revert "Temporarily disable Apache 2.2 support"
2016-01-19 15:25:30 -08:00
Peter Eckersley
6c0b1e46d7 Import latest upstream augeas lens
* Handles perl sripts embedded in Apache conf files
* Fixes: #2079
2016-01-18 11:42:52 -08:00
Peter Eckersley
bbb25c7d1b Merge remote-tracking branch 'origin/master' into non-interactive
(Merge conflict due to PEP8iness)
2016-01-15 16:04:38 -08:00
Peter Eckersley
432d250672 Revert "Temporarily disable Apache 2.2 support" 2016-01-15 15:49:15 -08:00
Joona Hoikkala
503787808a Merge remote-tracking branch 'upstream/master' into apache_pep8 2016-01-15 09:22:15 +02:00
Brad Warren
2939b62f24 Stop cover from failing 2016-01-14 16:59:29 -08:00
Brad Warren
b7b3f24da0 Convert sites-enabled files to symlinks 2016-01-14 16:35:20 -08:00
Joona Hoikkala
5357a556eb PyLint doesn't play well with six 2016-01-14 14:18:36 +02:00
Joona Hoikkala
be1d1321b6 Pep8 love 2016-01-14 13:25:15 +02:00
Peter Eckersley
8cc0d156e2 Merge pull request #2171 from letsencrypt/kill-22
Temporarily disable Apache 2.2 support
2016-01-13 16:26:04 -08:00
Brad Warren
8989dfc1ff Disable Apache 2.2 support 2016-01-13 16:17:26 -08:00
Joona Hoikkala
fe8a0dcef2 Make linter happy 2016-01-14 01:52:35 +02:00
Joona Hoikkala
8c110e31d7 Fixed tests 2016-01-14 01:30:34 +02:00
Joona Hoikkala
8f6ef8db53 Modified error message 2016-01-14 01:10:50 +02:00
Joona Hoikkala
d0832f7414 Added the missing test 2016-01-14 01:09:28 +02:00
Joona Hoikkala
ddbfb44041 Add tests 2016-01-14 00:50:34 +02:00
Joona Hoikkala
7d51480c4d Remove the test path from augeas even if failing 2016-01-14 00:23:45 +02:00
Joona Hoikkala
30ad7dce9f Pick up the augeas RuntimeError and pass the correct one 2016-01-14 00:06:52 +02:00
Joona Hoikkala
99c575f043 Check augeas version, and raise error if not recent enough 2016-01-13 23:56:22 +02:00
Brad Warren
4cdf63c55e Fix a couple nits 2016-01-11 18:27:01 -08:00
Brad Warren
24e6f4142b Merge branch 'master' into apache-redirect 2016-01-11 18:21:51 -08:00
Brad Warren
10df56bab6 Added revisions 2016-01-11 18:21:33 -08:00
sagi
b28b5b08d7 More tests; Make Nose happy 2016-01-11 20:59:19 +00:00
sagi
4645bf8329 Make lint happy 2016-01-11 20:58:52 +00:00
sagi
9c2a0362a7 Add rewrite tests: normal, small, quoted, etc. 2016-01-11 19:55:55 +00:00
sagi
a43e7b11f1 Add colon 2016-01-11 19:55:15 +00:00
sagi
82a58fec48 Dequote possible quoted target 2016-01-11 19:48:17 +00:00
sagi
ae572fe084 Make lint happy 2016-01-11 19:20:29 +00:00
sagi
6c18a7d318 Revise RewriteRule sifting algorithm 2016-01-11 19:15:23 +00:00
sagi
bf74b2cc64 Change test RewriteRule so that it conforms with Apaches spec. 2016-01-11 19:12:30 +00:00
sagi
20433db0bb Merge remote-tracking branch 'upstream/master' into bugfix_skeleton 2016-01-11 17:36:45 +00:00
Joona Hoikkala
39e4053b82 Removed some now obsolete mock code from tests 2016-01-10 19:15:09 +02:00
Joona Hoikkala
f5862a7a4f Parse all included paths in apache root configuration 2016-01-10 18:38:53 +02:00
Peter Eckersley
e58fc0aaa6 Merge pull request #2110 from letsencrypt/precise-bootstrap
Precise bootstrap
2016-01-10 02:36:10 -08:00
Peter Eckersley
5146a766c7 Merge pull request #2092 from joohoi/augeas_paths
Select broader wildcard matching pattern for augeas paths if overlapping
2016-01-10 02:15:10 -08:00
Peter Eckersley
cc890e6bdd Merge branch 'master' into non-interactive 2016-01-09 15:10:49 -08:00
Peter Eckersley
313dda65e1 Merge branch 'master' into precise-bootstrap 2016-01-08 14:41:50 -08:00
Noah Swartz
2c8d042974 added in tls_sni logging from #2002 2016-01-08 04:58:17 -08:00
Noah Swartz
287be6be8e fix linting issue 2016-01-08 02:47:59 -08:00
Noah Swartz
e7ae025a72 fixed mainline merge conflict 2016-01-08 02:36:35 -08:00
Noah Swartz
6fedd22dc8 don't iDisplay if logging 2016-01-08 02:00:47 -08:00
Peter Eckersley
4bdd96a29e Verbosity 2016-01-07 08:59:53 -08:00
Peter Eckersley
bbf25a2c5e Setenvif may be required for conf tests on ubuntu 12.04? 2016-01-07 08:57:13 -08:00
Philipp Spitzer
bda9a49a6a Added apache2 dav and dav_svn modules to debian_apache_2_4 two_vhost_80 test data.
Also added symlinks in mods-enabled to the newly added files to include
the modules in the test.
After doing so, many tests fail with "AttributeError: 'NoneType' object has no attribute 'lower'"
in letsencrypt_apache/parser.py", line 311.
2016-01-06 23:19:38 +01:00
watercrossing
4d3d6ff031 Fix for listen bug 2016-01-05 16:51:34 +00:00
Joona Hoikkala
ffeef67e54 Use lists to handle multiple different matching wildcards in same directory 2016-01-05 14:36:42 +02:00
Joona Hoikkala
32d5375b9b Change test to check out adding a file not already in the augeas paths 2016-01-05 13:21:18 +02:00
Joona Hoikkala
63f311eea4 Refactored the checking method to be easier to read 2016-01-05 13:16:49 +02:00
Joona Hoikkala
10a49532ae Add / replace functionality to augeas transform paths to overwrite old narrower scope if needed 2016-01-05 11:25:21 +02:00
sagi
a718cfede0 Copy only relevant lines from http vhost to ssl vhost skeleton 2016-01-03 22:03:47 +00:00
Peter Eckersley
b6531afb8d Merge pull request #1992 from letsencrypt/apache-conf-test
Apache conf tests in travis
2016-01-02 17:49:38 -08:00
Peter Eckersley
77ec944da1 One more apache unit test 2016-01-01 17:10:57 -08:00
Peter Eckersley
548ba6b655 lint 2015-12-29 20:26:55 -08:00
Peter Eckersley
7626975248 Make iDisplay.menu() calls non-interactive where possible
- And provide helpful errors where they're not
2015-12-29 14:21:05 -08:00
Joona Hoikkala
3fadfb5444 Fixed the find exe condition 2015-12-28 15:56:24 +02:00
Joona Hoikkala
ab069741f2 Fix tests 2015-12-28 14:03:50 +02:00
Joona Hoikkala
e3358bb153 Abstract the remaining commands to configurable ones 2015-12-28 13:47:14 +02:00
Joona Hoikkala
83812dc16a Abstract config file matching to os based constants 2015-12-28 12:56:44 +02:00
Peter Eckersley
ffd0d5aa56 Merge pull request #1811 from joohoi/multios_apache
Support apache plugin in different operating systems
2015-12-25 14:50:17 -08:00
Peter Eckersley
d6dcfa7b7f Revert "Issue 2002" 2015-12-25 13:18:19 -08:00
Joona Hoikkala
155469b51c Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-25 10:18:56 +02:00
Joona Hoikkala
c728219bc9 Changed define and version commands from string to list to avoid unneeded parsing later on 2015-12-25 10:18:24 +02:00
Peter Eckersley
32f2e2f326 Merge pull request #2009 from SwartzCr/issue_2002
Issue 2002
2015-12-24 12:37:01 -08:00
Noah Swartz
ea2c86b926 fixed linting and added logger 2015-12-23 16:08:33 -08:00
Peter Eckersley
ce9e3c1f94 Some OSes don't enable the mime module by default? 2015-12-23 15:00:07 -08:00
Noah Swartz
49f36f8071 also debug the written conf file 2015-12-23 14:57:14 -08:00