Ssl wildcard all site types by kirtangajjar · Pull Request #1171 · EasyEngine/easyengine

kirtangajjar · 2018-08-14T08:12:38Z

Issue ref: #1170 and EasyEngine/site-command#77

Other than that, this PR -

corrects SSL behaviour as discussed with team(use --ssl and --wildcard instead of --le).
Adds WWW domain while requesting cert - c576263
Adds function to reload ee-nginx-proxy container - 192fdc4
Fix http challenge creation - 6977a1d
Add ability to inherit cert - f74c8e1

Related PRs:
EasyEngine/site-command#98
EasyEngine/site-type-wp#17
EasyEngine/shell-command#5

closes #1170 and closes #77

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Correct solver debug message Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Update doc comment Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

…l-site-types

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

rahulsprajapati · 2018-08-22T07:40:04Z

+		$parent_site_name = implode( '.', array_slice( explode( '.', $site_name ), 1 ) );
+		$parent_site      = Site::find( $parent_site_name, [ 'site_ssl', 'site_ssl_wildcard' ] );
+
+		if ( $needs_wildcard ) {


If you know that you're not going to do anything and throw an error if the function's second parameter is exists then why call that function in first place?

ref: https://github.com/EasyEngine/easyengine/pull/1171/files#diff-43605c4fabcca6b901ccbab377546cfeR411

if ( $wildcard ) { throw new Exception( '--wildcard cannot be used with --ssl=inherit' ); } else { $this->inherit_certs( $site_name ); }

rahulsprajapati · 2018-08-22T08:24:45Z

+	 */
+	private function get_cert_domains( string $site_name, $wildcard ) : array {
+		$domains = [ $site_name ];
+		$has_www = strpos( $site_name, 'www.' ) === 0;


$has_www = ( strpos( $site_name, 'www.' ) === 0 );

rahulsprajapati · 2018-08-22T08:30:20Z

+	 * @return string Domain name with or without www
+	 */
+	private function get_www_domain( string $site_name ) : string {
+		$has_www = strpos( $site_name, 'www.' ) === 0;


$has_www = ( strpos( $site_name, 'www.' ) === 0 );

rahulsprajapati · 2018-08-22T08:33:23Z

+ * @param bool $inherit     inherit cert or not.
 */
-function add_site_redirects( $site_name, $le ) {
+function add_site_redirects( string $site_name, $ssl, $inherit ) {


Please maintain code consistency. here you're defining data type of function variable and other places you're not. Either you define it for all or not at all.
ref: https://github.com/EasyEngine/easyengine/pull/1171/files#diff-43605c4fabcca6b901ccbab377546cfeR404

rahulsprajapati · 2018-08-22T08:38:23Z

 			$content = "
 server {
 	listen  80;
+	server_name  $site_name_without_www;


Can this go in mustache template? It will be easy to read and update config in that.

rahulsprajapati · 2018-08-22T08:43:49Z

 			$content = "
 server {
 	listen  80;
+	server_name  $site_name_with_www;


Can this go in mustache template? It will be easy to read and update config in that.

rahulsprajapati · 2018-08-22T08:59:40Z

@mbtamuli Please review this PR for config related changes.
ref: https://github.com/EasyEngine/easyengine/pull/1171/files#diff-6dd1e8dbaffdb03759d37d087585f8a2R221

mbtamuli · 2018-08-22T10:08:49Z

@rahulsprajapati I've checked all the config regarding this wildcard configuration.

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

rahulsprajapati · 2018-08-22T10:54:06Z

 	}
+
+	$conf_data = [
+		'site_name' => $site_name,


Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

…o ssl-wildcard-all-site-types

This reverts commit 97b94a1.

renrayut · 2018-10-30T10:51:10Z

HI , when i try ee site create example.com --ssl=le get ssl file (.crt, .key,. pem ) on easyengine/nginx-proxy:v4.0.0-beta.6 container . it default type RSA-4096 . but i need type RSA-2048 for site . how to do?
cos i try to convert by openssl still can't complete.
thanks for reply .

kirtangajjar added 14 commits August 14, 2018 13:15

Correct ssl behaviour

b40ab48

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add http code in status check

c443525

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Correct Exception messages

4ac5623

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add WWW domain in cert

c576263

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add SSL cert config in www redirection block

17ada4d

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add function to reload ee-nginx-proxy container

192fdc4

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Remove redirection file while deleting site

e49083a

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add function for managing different SSL options

83cc7b8

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Create http challenge for each domain

6977a1d

Correct solver debug message Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Add parent site name on inheriting certs

f74c8e1

Update doc comment Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Merge remote-tracking branch 'origin/develop-v4' into ssl-wildcard-al…

03931df

…l-site-types

Correct ssl and ssl_wildcard values

acd873b

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Replace site['name'] eith site['url']

7c4b529

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Merge branch 'develop-v4' into ssl-wildcard-all-site-types

902676c

kirtangajjar changed the title ~~WIP: Ssl wildcard all site types~~ Ssl wildcard all site types Aug 22, 2018

kirtangajjar requested a review from rahulsprajapati August 22, 2018 06:37

kirtangajjar assigned rahulsprajapati and kirtangajjar and unassigned rahulsprajapati Aug 22, 2018

gg img-versions.json in phar

111d5c1

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

rahulsprajapati suggested changes Aug 22, 2018

View reviewed changes

rahulsprajapati requested a review from mbtamuli August 22, 2018 08:58

mbtamuli previously approved these changes Aug 22, 2018

View reviewed changes

Remove wildcard from inherit_certs

aedf157

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

kirtangajjar dismissed mbtamuli’s stale review via aedf157 August 22, 2018 10:44

kirtangajjar added 2 commits August 22, 2018 16:15

encapsulate statements with parenthesis

487fe2b

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Move site redirect to mustache file

ff00563

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

rahulsprajapati reviewed Aug 22, 2018

View reviewed changes

Align assoc array

465fb83

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

rahulsprajapati added Do Not Merge and removed Do Not Merge labels Aug 22, 2018

kirtangajjar changed the title ~~Ssl wildcard all site types~~ WIP: Ssl wildcard all site types Aug 22, 2018

Merge branch 'develop-v4' into ssl-wildcard-all-site-types

dea5d82

kirtangajjar changed the title ~~WIP: Ssl wildcard all site types~~ Ssl wildcard all site types Aug 22, 2018

rahulsprajapati changed the title ~~Ssl wildcard all site types~~ WIP: Ssl wildcard all site types Aug 22, 2018

rahulsprajapati changed the title ~~WIP: Ssl wildcard all site types~~ Ssl wildcard all site types Aug 22, 2018

rahulsprajapati previously approved these changes Aug 22, 2018

View reviewed changes

rahulsprajapati changed the title ~~Ssl wildcard all site types~~ WIP: Ssl wildcard all site types Aug 22, 2018

rahulsprajapati changed the title ~~WIP: Ssl wildcard all site types~~ Ssl wildcard all site types Aug 22, 2018

kirtangajjar mentioned this pull request Aug 22, 2018

Correct ssl behaviour EasyEngine/site-command#98

Merged

kirtangajjar added 2 commits August 22, 2018 17:54

Remove composer caching

97b94a1

Signed-off-by: Kirtan Gajjar <kirtangajjar95@gmail.com>

Merge remote-tracking branch 'kirtan/ssl-wildcard-all-site-types' int…

fb27688

…o ssl-wildcard-all-site-types

kirtangajjar dismissed rahulsprajapati’s stale review via fb27688 August 22, 2018 12:25

kirtangajjar added 2 commits August 22, 2018 18:27

Revert "Remove composer caching"

aad51a8

This reverts commit 97b94a1.

Merge branch 'develop-v4' into ssl-wildcard-all-site-types

57119fa

rahulsprajapati approved these changes Aug 22, 2018

View reviewed changes

rahulsprajapati merged commit 550e71c into EasyEngine:develop-v4 Aug 22, 2018

rahulsprajapati mentioned this pull request Aug 22, 2018

Allow provision for wildcard certificate for all site-types EasyEngine/site-command#77

Closed

kirtangajjar deleted the ssl-wildcard-all-site-types branch November 23, 2018 09:35

Conversation

kirtangajjar commented Aug 14, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rahulsprajapati commented Aug 22, 2018

Uh oh!

mbtamuli commented Aug 22, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

renrayut commented Oct 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kirtangajjar commented Aug 14, 2018 •

edited

Loading