From 15de2e680efe2e26326d101a3b476ae3fff51c49 Mon Sep 17 00:00:00 2001 From: Alexander Dietrich Date: Mon, 26 Mar 2018 22:23:47 +0200 Subject: [PATCH] Remove letsrenew role --- basics.yml | 5 ---- host_vars/srv04 | 1 - production | 4 --- roles/letsrenew/defaults/main.yml | 3 --- roles/letsrenew/tasks/main.yml | 40 ---------------------------- roles/letsrenew/templates/cli.ini.j2 | 27 ------------------- 6 files changed, 80 deletions(-) delete mode 100644 roles/letsrenew/defaults/main.yml delete mode 100644 roles/letsrenew/tasks/main.yml delete mode 100644 roles/letsrenew/templates/cli.ini.j2 diff --git a/basics.yml b/basics.yml index b3d9ac9..9a52ef0 100644 --- a/basics.yml +++ b/basics.yml @@ -9,8 +9,3 @@ roles: - certsync tags: certsync - -- hosts: letsrenew - roles: - - letsrenew - tags: letsrenew diff --git a/host_vars/srv04 b/host_vars/srv04 index 1d86390..827adbb 100644 --- a/host_vars/srv04 +++ b/host_vars/srv04 @@ -1,3 +1,2 @@ letsencrypt_webroot: /var/www/mail -letsrenew_email: alexander@hamburg.freifunk.net nginx_resolver: 80.252.105.162 80.252.105.194 diff --git a/production b/production index 2537bd3..1948978 100644 --- a/production +++ b/production @@ -6,10 +6,6 @@ srv04 ansible_host=srv04.hamburg.freifunk.net [certsync] srv03 -[letsrenew] -srv01 -srv04 - [updates] srv01 srv03 diff --git a/roles/letsrenew/defaults/main.yml b/roles/letsrenew/defaults/main.yml deleted file mode 100644 index 6ed18d2..0000000 --- a/roles/letsrenew/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -letsencrypt_webroot: /var/www/letsencrypt -letsrenew_email: "" diff --git a/roles/letsrenew/tasks/main.yml b/roles/letsrenew/tasks/main.yml deleted file mode 100644 index 1320edc..0000000 --- a/roles/letsrenew/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- name: create /opt/certbot - file: - path: /opt/certbot - mode: 0750 - state: directory - -- name: download certbot - get_url: - url: https://raw.githubusercontent.com/certbot/certbot/master/certbot-auto - dest: /opt/certbot/certbot-auto - mode: 0550 - -- name: create webroot path - file: - path: "{{ letsencrypt_webroot }}" - state: directory - -- name: create /etc/letsencrypt - file: - path: /etc/letsencrypt - state: directory - -- name: template cli.ini - template: - src: cli.ini.j2 - dest: /etc/letsencrypt/cli.ini - -- name: clone letsrenew - git: - repo: https://github.com/7adietri/letsrenew.git - dest: /opt/letsrenew - -- name: create cronjob - cron: - name: "Let's Encrypt certificate renewal" - job: "/opt/letsrenew/letsrenew {{ letsrenew_email }} /opt/certbot/certbot-auto" - minute: 0 - hour: 6 - weekday: 1 diff --git a/roles/letsrenew/templates/cli.ini.j2 b/roles/letsrenew/templates/cli.ini.j2 deleted file mode 100644 index 64ca959..0000000 --- a/roles/letsrenew/templates/cli.ini.j2 +++ /dev/null @@ -1,27 +0,0 @@ -agree-tos = True -non-interactive = True -renew-by-default = True -text = True - -# All flags used by the client can be configured here. Run Certbot with -# "--help" to learn more about the available options. -# -# Note that these options apply automatically to all use of Certbot for -# obtaining or renewing certificates, so options specific to a single -# certificate on a system with several certificates should not be placed -# here. - -# Use a 4096 bit RSA key instead of 2048 -rsa-key-size = 4096 - -# Uncomment and update to register with the specified e-mail address -email = backend@hamburg.freifunk.net - -# Uncomment to use the standalone authenticator on port 443 -# authenticator = standalone -# standalone-supported-challenges = tls-sni-01 - -# Uncomment to use the webroot authenticator. Replace webroot-path with the -# path to the public_html / webroot folder being served by your web server. -authenticator = webroot -webroot-path = {{ letsencrypt_webroot }}