Merge branch 'master' into 9-add-donotredirect-to-createvhosts-sh
This commit is contained in:
		
						commit
						5861111961
					
				
					 1 changed files with 5 additions and 1 deletions
				
			
		|  | @ -28,6 +28,7 @@ function usage | ||||||
| function get_cert | function get_cert | ||||||
| { | { | ||||||
| 	/root/.acme.sh/acme.sh --issue --domain $_domain --webroot /srv/http-content-combined/ --cert-file /etc/nginx/ssl/${_domain}.crt --key-file /etc/nginx/ssl/${_domain}.key --fullchain-file /etc/nginx/ssl/${_domain}-fullchain.crt | 	/root/.acme.sh/acme.sh --issue --domain $_domain --webroot /srv/http-content-combined/ --cert-file /etc/nginx/ssl/${_domain}.crt --key-file /etc/nginx/ssl/${_domain}.key --fullchain-file /etc/nginx/ssl/${_domain}-fullchain.crt | ||||||
|  |     return $? | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function reload_nginx | function reload_nginx | ||||||
|  | @ -216,7 +217,10 @@ echo "Reloading Nginx..." | ||||||
| reload_nginx | reload_nginx | ||||||
| 
 | 
 | ||||||
| echo "Retrieving Let's Encrypt Certificate..." | echo "Retrieving Let's Encrypt Certificate..." | ||||||
| get_cert | if ! get_cert; then | ||||||
|  |     rm $_vhost_conf_file | ||||||
|  |     err "Failed to retrieve certificate!" | ||||||
|  | fi | ||||||
| 
 | 
 | ||||||
| cat << EOF >> $_vhost_conf_file | cat << EOF >> $_vhost_conf_file | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue