Joona Hoikkala
|
503787808a
|
Merge remote-tracking branch 'upstream/master' into apache_pep8
|
2016-01-15 09:22:15 +02: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Joona Hoikkala
|
c29c6c96ae
|
Fix tests to complete the merge
|
2015-12-23 20:08:44 +02: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 |
|
 Joona HoikkalaandPeter Eckersley
|
67c0c454b4
|
Fixed bug in bootstrapping script
|
2015-12-22 11:07:07 -08:00 |
|
Joona Hoikkala
|
7b05d573f2
|
Abstracted the -D DUMP_RUN_CFG command to use os specific one, defined in constants
|
2015-12-22 10:32:18 +02: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 |
|
Joona Hoikkala
|
9e8f3cc644
|
Add gentoo fingerprint
|
2015-12-21 22:52:32 +02:00 |
|
Joona Hoikkala
|
8a1ee87314
|
Merge remote-tracking branch 'upstream/master' into multios_apache
|
2015-12-16 17:49:04 +02:00 |
|
Joona Hoikkala
|
936fc83bd1
|
Merge remote-tracking branch 'upstream/master' into domcheck_manual
|
2015-12-14 09:29:26 +02:00 |
|
Joona Hoikkala
|
77c67f1fa9
|
Gentoo constants, still missing gentoo fingerprint though
|
2015-12-14 09:27:16 +02:00 |
|
Joona Hoikkala
|
2b36a2f6c2
|
Merge remote-tracking branch 'upstream/master' into multios_apache
|
2015-12-14 09:26:07 +02:00 |
|
Joona Hoikkala
|
0805b08162
|
Make python 2.6 happy with the assertRaises
|
2015-12-11 13:17:21 +02: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 |
|
Joona Hoikkala
|
48b1240451
|
Removed redundant config parsing directive.
|
2015-12-11 09:18:00 +02:00 |
|
Joona Hoikkala
|
2a259ef2ff
|
Merge remote-tracking branch 'upstream/master' into multios_apache
# Conflicts:
# letsencrypt-apache/letsencrypt_apache/configurator.py
|
2015-12-11 00:33:30 +02:00 |
|
Joona Hoikkala
|
7bf8842ba7
|
Added missing test for full coverage
|
2015-12-11 00:03:00 +02:00 |
|
Joona Hoikkala
|
509c192ab8
|
Add RedHat Enterprise defaults to constants
|
2015-12-10 18:17:12 +02: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 |
|
Joona Hoikkala
|
55cac0dc9f
|
Fixed a2dismod help text
|
2015-12-09 17:05:31 +02:00 |
|
Joona Hoikkala
|
dae52e8db3
|
Revert "Travis bump"
This reverts commit e9a0c90e0f.
|
2015-12-09 16:37:36 +02:00 |
|
Joona Hoikkala
|
e9a0c90e0f
|
Travis bump
|
2015-12-09 16:37:23 +02:00 |
|
Joona Hoikkala
|
3c85a88de1
|
Merge remote-tracking branch 'upstream/master' into multios_apache
|
2015-12-09 15:29:05 +02:00 |
|
Joona Hoikkala
|
7830124be3
|
Merge remote-tracking branch 'upstream/master' into domcheck_manual
|
2015-12-09 15:27:28 +02:00 |
|
Joona Hoikkala
|
1ee9435db7
|
PEP8
|
2015-12-09 15:18:04 +02:00 |
|
Joona Hoikkala
|
5348af6559
|
Better coverage and test fixes
|
2015-12-09 15:03:14 +02:00 |
|
Joona Hoikkala
|
64f3d518a4
|
Test cases for manual domain validation
|
2015-12-09 13:22:39 +02:00 |
|
Joona Hoikkala
|
1d3cb57aef
|
Display meaningful error messages in manual domain entry, and give user an option to retry
|
2015-12-09 10:36:22 +02:00 |
|
Joona Hoikkala
|
05723cbb4a
|
Fixed wording
|
2015-12-08 21:28:23 +02:00 |
|
Joona Hoikkala
|
006edfdbd1
|
Wording change to error messages
|
2015-12-08 21:08:30 +02:00 |
|
Joona Hoikkala
|
0cb80bf753
|
Better test coverage
|
2015-12-08 14:23:46 +02:00 |
|
Joona Hoikkala
|
5c8b493eda
|
Whitespace and dot fix
|
2015-12-08 09:54:56 +02:00 |
|
Joona Hoikkala
|
0fb4f7dc8b
|
Tests for domain validation
|
2015-12-08 09:32:02 +02:00 |
|
Joona Hoikkala
|
3c1c3c3e8d
|
Import and non-classmethod fix
|
2015-12-08 09:31:47 +02:00 |
|
Joona Hoikkala
|
e891624cb1
|
Revert "Added domain checks for apache installer"
This reverts commit 5dcd508827.
|
2015-12-08 09:07:17 +02:00 |
|
Joona Hoikkala
|
d8b83bc478
|
Revert "Corrected tests to reflect the removal of wildcard domains etc."
This reverts commit 53a4d0725d.
|
2015-12-08 09:05:33 +02:00 |
|
Joona Hoikkala
|
51a5d7ceb0
|
Move validation code to main client
|
2015-12-08 09:05:11 +02: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
|
53a4d0725d
|
Corrected tests to reflect the removal of wildcard domains etc.
|
2015-12-07 16:05:53 +02:00 |
|
Joona Hoikkala
|
82f71cba9b
|
Linter fixes
|
2015-12-07 16:02:27 +02:00 |
|
Joona Hoikkala
|
5dcd508827
|
Added domain checks for apache installer
|
2015-12-07 15:37:09 +02:00 |
|
Joona Hoikkala
|
2d5d4a65c4
|
Moved domain check to le_util
|
2015-12-07 15:07:27 +02:00 |
|
Joona Hoikkala
|
5dd3ecfb53
|
Respect tool setting in rpm bootstrap
|
2015-12-07 14:42:14 +02:00 |
|
Joona Hoikkala
|
f479a9b894
|
Added fedora layout
|
2015-12-07 14:22:56 +02:00 |
|
Joona Hoikkala
|
47eb7d76cd
|
PEP8 & linter love
|
2015-12-07 13:37:58 +02:00 |
|
Joona Hoikkala
|
718a6481f1
|
Tests for the lone function in constants
|
2015-12-07 13:16:48 +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
|
c9f14e0461
|
Augeas test fix
|
2015-12-07 12:13:24 +02:00 |
|
Joona Hoikkala
|
3701560a88
|
Fix existing tests
|
2015-12-07 12:03:54 +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
|
cd0ae93ddc
|
Be more explicit in the configuration file parsing in vhost directory, augeas will silently fail if it encounters something funny
|
2015-12-07 11:06:32 +02:00 |
|
Joona Hoikkala
|
651c8702cb
|
Commented out TLS SNI apache extra config file logging options, because of distro specific paths
|
2015-12-07 01:16:07 +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
|
103454e4a3
|
Support CentOS configuration layout in parser
|
2015-12-06 22:46:28 +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
|
b856fc58af
|
Added correct os_info string for CentOS
|
2015-12-05 19:10:40 +02:00 |
|
Joona Hoikkala
|
da5b980674
|
Handle exe checks for distros missing some of the helper scripts
|
2015-12-05 18:53:13 +02:00 |
|
Joona Hoikkala
|
6c905056d2
|
Added option to disable apache module handling per OS basis
|
2015-12-05 18:41:57 +02:00 |
|
Joona Hoikkala
|
7d307d1cf4
|
Per-OS constants
|
2015-12-03 14:14:02 +02:00 |
|
Joona Hoikkala
|
5b4bf427b8
|
Added apache mod_ssl check & installation to bootstrap
|
2015-12-03 12:22:28 +02:00 |
|
Joona Hoikkala
|
0ccbbdb120
|
Style fix
|
2015-11-12 17:46:44 +02:00 |
|
Joona Hoikkala
|
37e94e631d
|
Added tests
|
2015-11-12 17:25:38 +02:00 |
|
Joona Hoikkala
|
56f21e1d35
|
Refactor --domain flag back to -- domains
|
2015-11-12 16:53:40 +02:00 |
|
Joona Hoikkala
|
3b8d6ec58b
|
Modified -d help text to reflect the change
|
2015-11-12 16:42:58 +02:00 |
|
Joona Hoikkala
|
14e03f9af0
|
Parse possible multiple domain definitions to a list
|
2015-11-12 16:34:15 +02:00 |
|
Joona Hoikkala
|
a0129f7818
|
Fix test broken by #1454 if nginx installation not present in system
|
2015-11-12 15:02:30 +02:00 |
|
Joona Hoikkala
|
3074ef996a
|
Refactored the argument and the code to use --domain instead of --domains, which was semantically incorrect
|
2015-11-10 12:29:08 +02:00 |
|
Joona Hoikkala
|
096c689fba
|
Added help text for -d flag
|
2015-11-10 12:03:15 +02:00 |
|
Joona Hoikkala
|
85675d709c
|
Case insensitive matching
|
2015-11-10 11:20:33 +02:00 |
|
Joona Hoikkala
|
747b7ca507
|
More robust way of detecting the mod_macro vhosts
|
2015-11-10 05:34:15 +02:00 |
|