Commit Graph
175 Commits
Author SHA1 Message Date
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
watercrossing 4d3d6ff031 Fix for listen bug 2016-01-05 16:51:34 +00:00
Joona Hoikkala 3fadfb5444 Fixed the find exe condition 2015-12-28 15:56:24 +02:00
Joona Hoikkala e3358bb153 Abstract the remaining commands to configurable ones 2015-12-28 13:47:14 +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
Noah Swartz c9b9b0edda add debug statement 2015-12-23 10:31:31 -08:00
Joona Hoikkala 2366b29755 Fix the flow let #1961 and #1811 coexist 2015-12-23 20:07:15 +02:00
Joona Hoikkala e7641dcdee Merge remote-tracking branch 'upstream/master' into multios_apache
# Conflicts:
#	letsencrypt-apache/letsencrypt_apache/configurator.py
#	letsencrypt-apache/letsencrypt_apache/parser.py
#	letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
2015-12-23 20:02:34 +02:00
Peter Eckersley 420cd1a106 Merge pull request #1961 from SwartzCr/issue_1208
Support Apache 2.2
2015-12-22 14:27:40 -08:00
Joona Hoikkala 9739a0f10e Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-21 23:53:08 +02:00
Joona Hoikkala 52167475df Get pass version to parser and ignore CLI checks for define for 2.2 as it returns empty results anyway 2015-12-21 23:51:22 +02:00
sagi 06643b35a0 Merge remote-tracking branch 'upstream/master' into bugfix_redirect 2015-12-11 12:14:02 +00:00
sagi 2edfc1cd59 simplified augeas get, with parsers get_arg func 2015-12-11 11:59:26 +00:00
sagi 5f05c5104e make lint happy 2015-12-11 11:13:32 +00:00
Joona Hoikkala 4d31a8cb39 Sane error message in case user tries to use apache-handle-sites functionality in non-supported environment. 2015-12-11 12:41:21 +02:00
sagi ab1e75e426 Change dir_dict to rewrite_args_dict 2015-12-11 10:17:46 +00:00
sagi 23a97b8281 Change iteration on dir_dict 2015-12-11 10:09:16 +00:00
sagi ad5817c7a9 reason about dir_dict 2015-12-11 10:05:09 +00:00
sagi 4748e1dd1e Name the list of two redirect argument lists 2015-12-11 09:57:08 +00:00
sagi 681de292b7 Switch to using defaultdict(list) 2015-12-11 09:29:02 +00:00
sagi c594a258fe Change comment on possibility of redirection loops 2015-12-11 09:26:55 +00:00
sagi b4746e555a typo: an other -> another 2015-12-11 09:18:36 +00:00
Joona Hoikkala 54127eef5a Don't call site enable methods when handle-sites is false for the operating system 2015-12-10 18:12:07 +02:00
Noah Swartz 414cfe9f13 Merge remote-tracking branch 'mainline/master' into issue_1208 2015-12-09 17:10:49 -08:00
Remi Rampin 80901a52d8 Fix help string for --apache-dismod 2015-12-09 12:26:23 -05:00
Joona Hoikkala 55cac0dc9f Fixed a2dismod help text 2015-12-09 17:05:31 +02:00
Joona Hoikkala 3c85a88de1 Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-09 15:29:05 +02:00
Ingolf Becker bbd6534744 Fixed some pep8 formatting 2015-12-08 17:56:16 +00:00
Ingolf Becker 62ea74b9e4 Modify apache plugin to work on setups where apache listens to a specific ip 2015-12-08 13:22:52 +00:00
Joona Hoikkala d4337f3936 Give user command line control on using enable site helper script 2015-12-07 17:12:42 +02:00
Joona Hoikkala 0ce4fa4c67 Was using constant name instead of conf name 2015-12-07 17:04:22 +02:00
Joona Hoikkala 47eb7d76cd PEP8 & linter love 2015-12-07 13:37:58 +02:00
Joona Hoikkala 4347382780 Moved enable_site check to correct place 2015-12-07 12:46:56 +02:00
Joona Hoikkala b02a881c6e Constant value per OS basis if installer should handle enabling / disabling sites 2015-12-07 12:42:40 +02:00
Joona Hoikkala 9e0bcf9f3c Add cli parameter for handle_mods 2015-12-07 12:38:52 +02:00
Joona Hoikkala 3d9f8c9748 Cleanup & pydoc 2015-12-07 12:01:35 +02:00
Joona Hoikkala 6e3da9e043 Configurable directory path for challenge configuration file 2015-12-07 11:07:31 +02:00
Joona Hoikkala e58c0a530f Call paper with customizable vhost root parameter 2015-12-07 01:15:29 +02:00
Joona Hoikkala b11f091023 Cleanup 2015-12-06 23:06:56 +02:00
Joona Hoikkala db9bf90cf9 Change apachectl parameters to work with other distros too 2015-12-06 22:42:51 +02:00
Joona Hoikkala e9c389f125 New constant for VirtualHost - configuration directory and changing the configurator to use it 2015-12-06 22:40:51 +02:00
Joona Hoikkala b723de431d Config parameter for configuration location that != server root 2015-12-06 11:33:57 +02:00
Joona Hoikkala da5b980674 Handle exe checks for distros missing some of the helper scripts 2015-12-05 18:53:13 +02:00