Commit graph

64 commits

Author SHA1 Message Date
Brad Warren
65f7f3e12b Modify special action types only once 2017-05-15 12:22:47 -07:00
Brad Warren
4d0cf8000a make a copy of keys in all python versions (#4614)
* make a copy of keys in all python versions

* documentation++
2017-05-03 18:42:47 -07:00
Brad Warren
83064941bc Merge pull request #4607 from certbot/joohoi_multiple_vhosts2
Multiple vhosts 2
2017-05-02 17:55:38 -07:00
Joona Hoikkala
65c7a5a6f7 Add support for multivhosts in Apache
* Case sensitivity fixes

* Clean up merge leftovers

* Get correct vhost paths when appending to already existing multivhost -le-ssl.conf

* Test, lint and reverter fixes

* Make py26 happy

* Removed skeletons

* Changed new vhost matching

* Added span flag for augeas init

* Extract VirtualHost using aug_span

* Removed dead code

* Fix tests to mitigate not being able to reload Augeas span values after write

* Small fixes and test coverage

* Implementing changes requested in review
2017-05-02 15:56:55 -07:00
Brad Warren
6b26015752 Further Apache multivhost improvements
* Don't filter vhosts on path if you've done so already

* add get_internal_aug_path

* Use relative augeas paths to determine if a file contains multiple virtual hosts
2017-05-02 15:56:48 -07:00
Peter Eckersley
2613a8b579 Continue work on Apache multivhost
* Apache: do not assume directives will be CamelCased

* Fixup

* Elaborate

* Simplify the definition of vh_p
2017-05-02 15:38:49 -07:00
Noah Swartz
f57f35b1dd Start work on multivhost support in Apache
* get through parsing

* not slice

* add mult vhost per file

* idx line backwards

* blocks be wrong

* always close ifmod

* let's not mess up indexes

* don't double add multi

* fix some lint, only dedupe multi

* tests

* fix lint

* in progress bit flip

* try to pick the right vhost

* take Dominic's suggestion

* don't redo search

* add ancestor

* we now support multiple vhosts

* yay

* add docstrings
2017-05-02 15:38:27 -07:00
Brad Warren
5ca8f7c5b9 Add lockfile (#4449)
* add lock_file

* cleanup lock file

* Add LockFile tests

* add lock_dir

* add lock_dir_until_exit

* add set_up_core_dir and move lock_dir_until_exit

* Move lock_and_call to certbot.test.util

* Add lock to Apache

* Add lock to the Nginx plugin

* Improve permissions error message

* sort plugins

* add test_prepare_order

* provide more actionable permissions error

* Document and catch use of OSError

* don't lock a directory twice

* add conditional dependency on ordereddict

* Add lock_test

* expand sorted plugins comment

* Add lock_test to lint

* make make_lineage more conventional and flexible

* enhance lock_test.py

* add lock_test to tox

* Readd success message

* make py26 happy

* add test_acquire_without_deletion
2017-05-01 14:49:12 -07:00
Daniel Huang
1e36783986 Still include apache version in debug logging 2017-03-18 21:37:37 -04:00
Daniel Huang
b9121a8a37 Do not output apache version when deploying cert (#4023) 2017-03-18 21:14:53 -04:00
Sagi Kedmi
26a7023b8d Change QSA to NE in HTTPS redirection (#4204)
* Change QSA to NE in HTTPS redirection

* Seamless transition to new HTTPS redirection RewriteRule
2017-03-02 16:49:34 -08:00
Joona Hoikkala
28cbd6e7d3 Fix for case sensitivity when looking for vhosts (#4193) 2017-02-23 20:28:36 -08:00
Amjad Mashaal
1fd847e216 Adding checking name validity to the Apache plugin (#3639) 2017-02-01 07:12:51 -08:00
Juho Juopperi
2797a0377d Fix misspelling "recieved" (#4059) 2017-01-17 13:43:43 -08:00
Brad Warren
28ce10fef5 Don't add ServerAlias directives when the domain is already covered by a wildcard (#3917)
* correctly match * and ? in ServerAlias directives

* update Apache wildcard test

* Consolidate wildcard matching and remove bad test

* Test Apache vhost selection with wildcards

* Added few more tests to proof vhost selection
2016-12-20 15:53:52 -08:00
Brad Warren
ae379568b1 Mitigate problems for people who run without -n (#3916)
* CLI flag for forcing interactivity

* add --force-interactive

* Add force_interactive error checking and tests

* Add force_interactive parameter to FileDisplay

* add _can_interact

* Add _return_default

* Add **unused_kwargs to NoninteractiveDisplay

* improve _return_default assertion

* Change IDisplay calls and write tests

* Document force_interactive in interfaces.py

* Don't force_interactive with a new prompt

* Warn when skipping an interaction for the first time

* add specific logger.debug message
2016-12-19 12:45:40 -08:00
Nick Fong
dd8772b608 Remove get_all_certs_keys() from Apache and Nginx (#3768)
- Remove get_all_certs_keys() implementation in
    - certbot-apache/certbot_apache/configurator.py
- Remove corresponding tests for get_all_certs_keys() in
    - certbot-apache/certbot_apache/tests/configurator_test.py
- Remove get_all_certs_keys() implementation in
    - certbot-nginx/certbot_nginx/configurator.py
    - certbot-nginx/certbot_nginx/parser.py
- Remove corresponding tests for get_all_certs_keys() in:
    - certbot-nginx/certbot_nginx/tests/configurator_test.py
    - certbot-nginx/certbot_nginx/tests/parser_test.py

Resolves #3762
2016-11-08 17:19:05 -08:00
DanCld
ed7c022565 Lint fix, space before parentheses 2016-08-22 08:16:20 +03:00
DanCld
df68b44d38 Fix apache logs dir for centos 2016-08-21 21:50:14 +03:00
Peter Eckersley
7da7d47e8a Merge remote-tracking branch 'origin/master' into multi-topic-help 2016-08-12 17:40:49 -07:00
Joona Hoikkala
14f3710250
Added check for /files/ 2016-08-10 10:39:10 +03:00
Joona Hoikkala
f4948855f0
Added None check and according test 2016-08-10 01:24:21 +03:00
Joona Hoikkala
c29e8c3332
Refactored get_file_path 2016-08-09 23:43:11 +03:00
Ville Skyttä
c7b89c334b Use logger.warning instead of deprecated warn 2016-07-22 09:54:28 +03:00
Peter Eckersley
a49d26f607 Merge remote-tracking branch 'origin/master' into multi-topic-help 2016-07-20 16:56:23 -07:00
Brad Warren
2e50b38b45 Merge pull request #3182 from certbot/issue_2983
Handle commas in apache filenames (Issue 2983)
2016-07-15 16:31:16 -07:00
Noah Swartz
8f1a141d2a incorporate brad's comments 2016-07-11 13:20:31 -07:00
Peter Eckersley
c051826ea2 Merge pull request #3261 from certbot/apache-path-fallback
Apache plugin PATH fallback
2016-07-08 16:59:28 -07:00
Noah Swartz
1fc84c83e2 Merge pull request #3234 from sagi/rewrite
Comment out corresponding RewriteConds for filtered RewriteRule
2016-07-08 16:06:26 -07:00
Noah Swartz
1bbfde1771 don't code while distracted 2016-07-08 15:35:29 -07:00
Noah Swartz
d8c2dd1a5c add self 2016-07-08 15:28:12 -07:00
Noah Swartz
1113e28046 fix typo 2016-07-08 15:22:56 -07:00
Noah Swartz
d4a8820bdc wrap with escapes 2016-07-08 15:04:44 -07:00
Peter Eckersley
0bedeb449a Refactor path_surgery into plugins.util so that nginx can call it 2016-07-08 14:03:21 -07:00
Peter Eckersley
757a8ddae7 Fixes & tests 2016-07-08 13:21:37 -07:00
Peter Eckersley
cecac803a0 Do this more cleanly 2016-07-08 13:21:37 -07:00
Peter Eckersley
a322f44f2b Implement PATH fallback for apachectl search 2016-07-08 13:21:37 -07:00
Peter Eckersley
754b7956b3 Make the error even more informative 2016-07-08 13:21:37 -07:00
Peter Eckersley
c3244df951 more doc improvements 2016-07-08 10:12:57 -07:00
Peter Eckersley
fd35a1c724 Explain why Apache [appears] not to be installed
Would help debug #3244
2016-07-06 12:43:48 -07:00
sagi
0e9622322a typo 2016-07-01 22:17:41 +00:00
sagi
15ba12ed46 Parsing State Machine + some tests 2016-07-01 21:06:16 +00:00
sagi
a9abc7b39e typo 2016-07-01 15:17:37 +00:00
Peter Eckersley
7b50960ac0 Address review comments 2016-06-29 13:57:58 -07:00
Noah Swartz
2884a7fcb7 Merge branch 'master' into issue_2983 2016-06-28 17:57:10 -07:00
Peter Eckersley
e0691ede2c Provide clear log messages when Apache tries a default vhost 2016-06-25 10:59:41 -07:00
Noah Swartz
d67bc67681 add self 2016-06-24 16:17:09 -07:00
Noah Swartz
07fb5dd9cc escape and unescape augeas 2016-06-24 15:55:51 -07:00
Joona Hoikkala
418a5d501f
Refactored adding of listen statements 2016-06-20 08:58:22 +03:00
Joona Hoikkala
556582bb3b Merge remote-tracking branch 'upstream/master' into centos_listen 2016-06-18 23:50:58 +03:00