mirror of
https://github.com/certbot/certbot.git
synced 2026-06-08 16:22:18 -04:00
rename letstest stuff
This commit is contained in:
Brad Warren
parent
75a1d81458
commit
b4f6ed8470
4 changed files with 21 additions and 21 deletions
|
|
@ -1,10 +1,10 @@
|
|||
# letstest
|
||||
simple aws testfarm scripts for letsencrypt client testing
|
||||
simple aws testfarm scripts for certbot client testing
|
||||
|
||||
- Configures (canned) boulder server
|
||||
- Launches EC2 instances with a given list of AMIs for different distros
|
||||
- Copies letsencrypt repo and puts it on the instances
|
||||
- Runs letsencrypt tests (bash scripts) on all of these
|
||||
- Copies certbot repo and puts it on the instances
|
||||
- Runs certbot tests (bash scripts) on all of these
|
||||
- Logs execution and success/fail for debugging
|
||||
|
||||
## Notes
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ Letsencrypt Integration Test Tool
|
|||
|
||||
- Configures (canned) boulder server
|
||||
- Launches EC2 instances with a given list of AMIs for different distros
|
||||
- Copies letsencrypt repo and puts it on the instances
|
||||
- Runs letsencrypt tests (bash scripts) on all of these
|
||||
- Copies certbot repo and puts it on the instances
|
||||
- Runs certbot tests (bash scripts) on all of these
|
||||
- Logs execution and success/fail for debugging
|
||||
|
||||
Notes:
|
||||
|
|
@ -61,10 +61,10 @@ parser.add_argument('test_script',
|
|||
# required=False)
|
||||
parser.add_argument('--repo',
|
||||
default='https://github.com/letsencrypt/letsencrypt.git',
|
||||
help='letsencrypt git repo to use')
|
||||
help='certbot git repo to use')
|
||||
parser.add_argument('--branch',
|
||||
default='~',
|
||||
help='letsencrypt git branch to trial')
|
||||
help='certbot git branch to trial')
|
||||
parser.add_argument('--pull_request',
|
||||
default='~',
|
||||
help='letsencrypt/letsencrypt pull request to trial')
|
||||
|
|
@ -291,7 +291,7 @@ def config_and_launch_boulder(instance):
|
|||
execute(deploy_script, 'scripts/boulder_config.sh')
|
||||
execute(run_boulder)
|
||||
|
||||
def install_and_launch_letsencrypt(instance, boulder_url, target):
|
||||
def install_and_launch_certbot(instance, boulder_url, target):
|
||||
execute(local_repo_to_remote)
|
||||
with shell_env(BOULDER_URL=boulder_url,
|
||||
PUBLIC_IP=instance.public_ip_address,
|
||||
|
|
@ -301,13 +301,13 @@ def install_and_launch_letsencrypt(instance, boulder_url, target):
|
|||
OS_TYPE=target['type']):
|
||||
execute(deploy_script, cl_args.test_script)
|
||||
|
||||
def grab_letsencrypt_log():
|
||||
def grab_certbot_log():
|
||||
"grabs letsencrypt.log via cat into logged stdout"
|
||||
sudo('if [ -f /var/log/letsencrypt/letsencrypt.log ]; then \
|
||||
cat /var/log/letsencrypt/letsencrypt.log; else echo "[novarlog]"; fi')
|
||||
# fallback file if /var/log is unwriteable...? correct?
|
||||
sudo('if [ -f ./letsencrypt.log ]; then \
|
||||
cat ./letsencrypt.log; else echo "[nolocallog]"; fi')
|
||||
sudo('if [ -f ./certbot.log ]; then \
|
||||
cat ./certbot.log; else echo "[nolocallog]"; fi')
|
||||
|
||||
def create_client_instances(targetlist):
|
||||
"Create a fleet of client instances"
|
||||
|
|
@ -357,10 +357,10 @@ def test_client_process(inqueue, outqueue):
|
|||
print("%s - %s FAIL"%(target['ami'], target['name']))
|
||||
pass
|
||||
|
||||
# append server letsencrypt.log to each per-machine output log
|
||||
print("\n\nletsencrypt.log\n" + "-"*80 + "\n")
|
||||
# append server certbot.log to each per-machine output log
|
||||
print("\n\ncertbot.log\n" + "-"*80 + "\n")
|
||||
try:
|
||||
execute(grab_letsencrypt_log)
|
||||
execute(grab_certbot_log)
|
||||
except:
|
||||
print("log fail\n")
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ then
|
|||
sudo chmod -R oug+rwx /var/www
|
||||
sudo chmod -R oug+rw /etc/httpd
|
||||
sudo echo '<html><head><title>foo</title></head><body>bar</body></html>' > /var/www/$PUBLIC_HOSTNAME/public_html/index.html
|
||||
sudo mkdir /etc/httpd/sites-available #letsencrypt requires this...
|
||||
sudo mkdir /etc/httpd/sites-enabled #letsencrypt requires this...
|
||||
sudo mkdir /etc/httpd/sites-available #certbot requires this...
|
||||
sudo mkdir /etc/httpd/sites-enabled #certbot requires this...
|
||||
#sudo echo "IncludeOptional sites-enabled/*.conf" >> /etc/httpd/conf/httpd.conf
|
||||
sudo echo """
|
||||
<VirtualHost *:80>
|
||||
|
|
@ -35,7 +35,7 @@ then
|
|||
#sudo cp /etc/httpd/sites-available/$PUBLIC_HOSTNAME.conf /etc/httpd/sites-enabled/
|
||||
fi
|
||||
|
||||
# Run letsencrypt-apache2.
|
||||
# Run certbot-apache2.
|
||||
cd letsencrypt
|
||||
|
||||
echo "Bootstrapping dependencies..."
|
||||
|
|
@ -45,7 +45,7 @@ if [ $? -ne 0 ] ; then
|
|||
fi
|
||||
|
||||
tools/venv.sh
|
||||
sudo venv/bin/letsencrypt -v --debug --text --agree-dev-preview --agree-tos \
|
||||
sudo venv/bin/certbot -v --debug --text --agree-dev-preview --agree-tos \
|
||||
--renew-by-default --redirect --register-unsafely-without-email \
|
||||
--domain $PUBLIC_HOSTNAME --server $BOULDER_URL
|
||||
if [ $? -ne 0 ] ; then
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# $OS_TYPE $PUBLIC_IP $PRIVATE_IP $PUBLIC_HOSTNAME $BOULDER_URL
|
||||
# are dynamically set at execution
|
||||
|
||||
# run letsencrypt-apache2 via letsencrypt-auto
|
||||
# run certbot-apache2 via letsencrypt-auto
|
||||
cd letsencrypt
|
||||
|
||||
export SUDO=sudo
|
||||
|
|
@ -19,7 +19,7 @@ else
|
|||
fi
|
||||
|
||||
bootstrap/dev/venv.sh
|
||||
sudo venv/bin/letsencrypt certonly --debug --standalone -t --agree-dev-preview --agree-tos \
|
||||
sudo venv/bin/certbot certonly --debug --standalone -t --agree-dev-preview --agree-tos \
|
||||
--renew-by-default --redirect --register-unsafely-without-email \
|
||||
--domain $PUBLIC_HOSTNAME --server $BOULDER_URL -v
|
||||
if [ $? -ne 0 ] ; then
|
||||
|
|
@ -36,7 +36,7 @@ if [ $? -ne 0 ] ; then
|
|||
FAIL=1
|
||||
fi
|
||||
|
||||
sudo venv/bin/letsencrypt renew --renew-by-default
|
||||
sudo venv/bin/certbot renew --renew-by-default
|
||||
|
||||
if [ $? -ne 0 ] ; then
|
||||
FAIL=1
|
||||
|
|
|
|||
Loading…
Reference in a new issue