update letsencrypt and domain
This commit is contained in:
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2018-2019 WordOps
|
||||
Copyright (c) 2018-2019 WordOps (https://wordops.io)
|
||||
Copyright (C) 2011-2017 EE Development Group (https://github.com/ee/ee/contributors)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<h1 align="center" style="font-size:54px;"><a href="https://wordops.org">
|
||||
<h1 align="center" style="font-size:54px;"><a href="https://wordops.io">
|
||||
WordOps</a>
|
||||
<br>
|
||||
</h1>
|
||||
@@ -151,4 +151,4 @@ If you'd like to contribute, please fork the repository and make changes as you'
|
||||
|
||||
## License
|
||||
|
||||
- [MIT](http://opensource.org/licenses/MIT) © [WordOps](https://wordops.org)
|
||||
- [MIT](http://opensource.org/licenses/MIT) © [WordOps](https://wordops.io)
|
||||
|
||||
6
install
6
install
@@ -2,7 +2,7 @@
|
||||
# -------------------------------------------------------------------------
|
||||
# WordOps install and update script
|
||||
# -------------------------------------------------------------------------
|
||||
# Website: https://wordops.org
|
||||
# Website: https://wordops.io
|
||||
# GitHub: https://github.com/WordOps/WordOps
|
||||
# Copyright (c) 2019 - WordOps
|
||||
# This script is licensed under M.I.T
|
||||
@@ -613,7 +613,7 @@ if [ "$migration" -eq "1" ]; then
|
||||
wo_lib_echo_info "For autocompletion, run the following command:"
|
||||
wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc"
|
||||
echo
|
||||
wo_lib_echo "WordOps (wo) help: https://wordops.org/docs"
|
||||
wo_lib_echo "WordOps (wo) help: https://wordops.io/docs"
|
||||
else
|
||||
echo
|
||||
wo_lib_echo "For WordOps (wo) auto completion, run the following command"
|
||||
@@ -621,5 +621,5 @@ else
|
||||
wo_lib_echo_info "source /etc/bash_completion.d/wo_auto.rc"
|
||||
echo
|
||||
wo_lib_echo "Yay! WordOps (wo) installed/updated successfully"
|
||||
wo_lib_echo "WordOps (wo) help: https://wordops.org/docs"
|
||||
wo_lib_echo "WordOps (wo) help: https://wordops.io/docs"
|
||||
fi
|
||||
|
||||
2
setup.py
2
setup.py
@@ -64,7 +64,7 @@ setup(name='wo',
|
||||
classifiers=[],
|
||||
keywords='',
|
||||
author='WordOps',
|
||||
author_email='core@wordops.org',
|
||||
author_email='core@wordops.io',
|
||||
url='https://wordops.io',
|
||||
license='MIT',
|
||||
packages=find_packages(exclude=['ez_setup', 'examples', 'tests',
|
||||
|
||||
@@ -1368,7 +1368,7 @@ def renewLetsEncrypt(self, wo_domain_name):
|
||||
# "\nPlease check the WordOps log for reason
|
||||
# The current expiry date is : " +
|
||||
# str(SSL.getExpirationDate(self, wo_domain_name)) +
|
||||
# "\n\nFor support visit https://wordops.org/support .
|
||||
# "\n\nFor support visit https://wordops.io/support .
|
||||
# \n\nBest regards,\nYour WordOps Worker", files=mail_list,
|
||||
# port=25, isTls=False)
|
||||
Log.error(self, "Check the WO log for more details "
|
||||
@@ -1466,6 +1466,8 @@ def archivedCertificateHandle(self, domain):
|
||||
.format(WOVariables.wo_ssl_live, domain))
|
||||
if ssl:
|
||||
|
||||
try:
|
||||
|
||||
if not os.path.isfile("/var/www/{0}/conf/nginx/ssl.conf"
|
||||
.format(domain)):
|
||||
Log.info(
|
||||
@@ -1485,6 +1487,11 @@ def archivedCertificateHandle(self, domain):
|
||||
|
||||
updateSiteInfo(self, domain, ssl=True)
|
||||
|
||||
except IOError as e:
|
||||
Log.debug(self, str(e))
|
||||
Log.debug(self, "Error occured while generating "
|
||||
"ssl.conf")
|
||||
|
||||
elif (check_prompt == "2"):
|
||||
Log.info(self, "Using Existing Certificate files")
|
||||
if not os.path.isfile("{0}/{1}/fullchain.pem"
|
||||
@@ -1493,7 +1500,8 @@ def archivedCertificateHandle(self, domain):
|
||||
"Please check if following file exist"
|
||||
"\n\t/etc/letsencrypt/live/{0}/fullchain.pem\n\t"
|
||||
"/etc/letsencrypt/live/{0}/key.pem".format(domain))
|
||||
ssl = True
|
||||
|
||||
updateSiteInfo(self, domain, ssl=True)
|
||||
|
||||
elif (check_prompt == "3"):
|
||||
Log.info(self, "Please wait while we renew the Let's Encrypt"
|
||||
@@ -1506,6 +1514,28 @@ def archivedCertificateHandle(self, domain):
|
||||
"--force"
|
||||
.format(domain))
|
||||
|
||||
if issuessl:
|
||||
|
||||
try:
|
||||
|
||||
WOShellExec.cmd_exec(self, "mkdir -p {0}/{1} && "
|
||||
"/etc/letsencrypt/acme.sh "
|
||||
"--config-home "
|
||||
"'/etc/letsencrypt/config' "
|
||||
"--install-cert -d {1} --ecc "
|
||||
"--cert-file {0}/{1}/cert.pem "
|
||||
"--key-file {0}/{1}/key.pem "
|
||||
"--fullchain-file "
|
||||
"{0}/{1}/fullchain.pem "
|
||||
"--reloadcmd "
|
||||
"\"service nginx restart\" "
|
||||
.format(WOVariables.wo_ssl_live, domain))
|
||||
|
||||
except IOError as e:
|
||||
Log.debug(self, str(e))
|
||||
Log.debug(self, "Error occured while installing "
|
||||
"the certificate")
|
||||
|
||||
else:
|
||||
Log.error(self, "Operation cancelled by user.")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user