Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F12205565
D3731.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D3731.diff
View Options
diff --git a/roles/core/certificates/acmesh.sls b/roles/core/certificates/acmesh.sls
--- a/roles/core/certificates/acmesh.sls
+++ b/roles/core/certificates/acmesh.sls
@@ -41,7 +41,7 @@
/usr/local/etc/newsyslog.conf.d/acme.sh.conf:
file.managed:
- - source: salt://roles/core/certificates/files/syslog/acme.sh.conf
+ - source: salt://roles/core/certificates/files/acmesh/syslog.conf
acmesh_newsyslog_run:
cmd.run:
@@ -55,5 +55,5 @@
{{ dirs.bin }}/acmesh-nginxCheck:
file.managed:
- - source: salt://roles/core/certificates/files/acmesh-nginxCheck.sh
+ - source: salt://roles/core/certificates/files/acmesh/nginxCheck.sh
- mode: 755
diff --git a/roles/core/certificates/files/acmesh-nginxCheck.sh b/roles/core/certificates/files/acmesh/nginxCheck.sh
rename from roles/core/certificates/files/acmesh-nginxCheck.sh
rename to roles/core/certificates/files/acmesh/nginxCheck.sh
--- a/roles/core/certificates/files/acmesh-nginxCheck.sh
+++ b/roles/core/certificates/files/acmesh/nginxCheck.sh
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/certificates/files/acmesh-nginxCheck.sh
+# Source file: roles/core/certificates/files/acmesh/nginxCheck.sh
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/syslog/acme.sh.conf b/roles/core/certificates/files/acmesh/syslog.conf
rename from roles/core/certificates/files/syslog/acme.sh.conf
rename to roles/core/certificates/files/acmesh/syslog.conf
--- a/roles/core/certificates/files/syslog/acme.sh.conf
+++ b/roles/core/certificates/files/acmesh/syslog.conf
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/certificates/files/acmesh/acme.sh.conf
+# Source file: roles/core/certificates/files/acmesh/syslog.conf
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/acme-dns-auth.py b/roles/core/certificates/files/certbot/acme-dns/acme-dns-auth.py
rename from roles/core/certificates/files/acme-dns-auth.py
rename to roles/core/certificates/files/certbot/acme-dns/acme-dns-auth.py
--- a/roles/core/certificates/files/acme-dns-auth.py
+++ b/roles/core/certificates/files/certbot/acme-dns/acme-dns-auth.py
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Author: Joona Hoikkala
# License: MIT
-# Source file: roles/core/certificates/files/acme-dns-auth.py
+# Source file: roles/core/certificates/files/certbot/acme-dns/acme-dns-auth.py
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/edit-acme-dns-accounts.py b/roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py
rename from roles/core/certificates/files/edit-acme-dns-accounts.py
rename to roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py
--- a/roles/core/certificates/files/edit-acme-dns-accounts.py
+++ b/roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py
@@ -7,7 +7,7 @@
# Description: Edit acmedns.json to import credentials
# for a specific subdomain to verify.
# License: BSD-2-Clause
-# Source file: roles/core/certificates/files/edit-acme-dns-accounts.py
+# Source file: roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/cli.ini b/roles/core/certificates/files/certbot/cli.ini
rename from roles/core/certificates/files/cli.ini
rename to roles/core/certificates/files/certbot/cli.ini
--- a/roles/core/certificates/files/cli.ini
+++ b/roles/core/certificates/files/certbot/cli.ini
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/certificates/files/cli.ini
+# Source file: roles/core/certificates/files/certbot/cli.ini
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/730.letsencrypt b/roles/core/certificates/files/certbot/periodic/730.letsencrypt
rename from roles/core/certificates/files/730.letsencrypt
rename to roles/core/certificates/files/certbot/periodic/730.letsencrypt
--- a/roles/core/certificates/files/730.letsencrypt
+++ b/roles/core/certificates/files/certbot/periodic/730.letsencrypt
@@ -6,7 +6,7 @@
# Project: Nasqueron
# Author : FreeBSD contributors
# License: BSD-2-Clause
-# Source file: roles/core/certificates/files/730.letsencrypt
+# Source file: roles/core/certificates/files/certbot/periodic/730.letsencrypt
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/letsencrypt-renewal.sh b/roles/core/certificates/files/certbot/renewal/standard.sh
rename from roles/core/certificates/files/letsencrypt-renewal.sh
rename to roles/core/certificates/files/certbot/renewal/standard.sh
--- a/roles/core/certificates/files/letsencrypt-renewal.sh
+++ b/roles/core/certificates/files/certbot/renewal/standard.sh
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/certificates/files/letsencrypt-renewal.sh
+# Source file: roles/core/certificates/files/certbot/renewal/standard.sh
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/letsencrypt-renewal-without-nginx.sh b/roles/core/certificates/files/certbot/renewal/without-nginx.sh
rename from roles/core/certificates/files/letsencrypt-renewal-without-nginx.sh
rename to roles/core/certificates/files/certbot/renewal/without-nginx.sh
--- a/roles/core/certificates/files/letsencrypt-renewal-without-nginx.sh
+++ b/roles/core/certificates/files/certbot/renewal/without-nginx.sh
@@ -5,7 +5,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/core/certificates/files/letsencrypt-renewal-without-nginx.sh
+# Source file: roles/core/certificates/files/certbot/renewal/without-nginx.sh
# -------------------------------------------------------------
#
# <auto-generated>
diff --git a/roles/core/certificates/files/check-letsencrypt-certificates.py b/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
rename from roles/core/certificates/files/check-letsencrypt-certificates.py
rename to roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
--- a/roles/core/certificates/files/check-letsencrypt-certificates.py
+++ b/roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
@@ -8,8 +8,15 @@
# for the mapping directory webserver for each
# certificate to renew. HTTP only.
# License: BSD-2-Clause
-# Source file: roles/core/certificates/files/check-letsencrypt-certificates.py
+# Source file: roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
# -------------------------------------------------------------
# Table of contents
diff --git a/roles/core/certificates/files/delete-certbot-certificate.sh b/roles/core/certificates/files/certbot/utilities/delete-certbot-certificate.sh
rename from roles/core/certificates/files/delete-certbot-certificate.sh
rename to roles/core/certificates/files/certbot/utilities/delete-certbot-certificate.sh
--- a/roles/core/certificates/files/delete-certbot-certificate.sh
+++ b/roles/core/certificates/files/certbot/utilities/delete-certbot-certificate.sh
@@ -5,7 +5,15 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: BSD-2-Clause
+# Source file: roles/core/certificates/files/certbot/utilities/delete-certbot-certificate.sh
# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
set -e
diff --git a/roles/core/certificates/letsencrypt.sls b/roles/core/certificates/letsencrypt.sls
--- a/roles/core/certificates/letsencrypt.sls
+++ b/roles/core/certificates/letsencrypt.sls
@@ -40,7 +40,7 @@
{{ dirs.etc }}/letsencrypt/cli.ini:
file.managed:
- - source: salt://roles/core/certificates/files/cli.ini
+ - source: salt://roles/core/certificates/files/certbot/cli.ini
- makedirs: True
# -------------------------------------------------------------
@@ -49,23 +49,23 @@
{{ dirs.bin }}/check-letsencrypt-certificates:
file.managed:
- - source: salt://roles/core/certificates/files/check-letsencrypt-certificates.py
+ - source: salt://roles/core/certificates/files/certbot/utilities/check-letsencrypt-certificates.py
- mode: 755
{{ dirs.etc }}/letsencrypt/acme-dns-auth:
file.managed:
- - source: salt://roles/core/certificates/files/acme-dns-auth.py
+ - source: salt://roles/core/certificates/files/certbot/acme-dns/acme-dns-auth.py
- mode: 755
- makedirs: True
{{ dirs.bin }}/edit-acme-dns-accounts:
file.managed:
- - source: salt://roles/core/certificates/files/edit-acme-dns-accounts.py
+ - source: salt://roles/core/certificates/files/certbot/acme-dns/edit-acme-dns-accounts.py
- mode: 755
{{ dirs.bin }}/delete-certbot-certificate:
file.managed:
- - source: salt://roles/core/certificates/files/delete-certbot-certificate.sh
+ - source: salt://roles/core/certificates/files/certbot/utilities/delete-certbot-certificate.sh
- mode: 755
# -------------------------------------------------------------
@@ -76,20 +76,20 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% if has_nginx %}
-{% set renewal_script = "letsencrypt-renewal.sh" %}
+{% set renewal_script = "standard.sh" %}
{% else %}
-{% set renewal_script = "letsencrypt-renewal-without-nginx.sh" %}
+{% set renewal_script = "without-nginx.sh" %}
{% endif %}
/usr/local/sbin/letsencrypt-renewal:
file.managed:
- - source: salt://roles/core/certificates/files/{{ renewal_script }}
+ - source: salt://roles/core/certificates/files/certbot/renewal/{{ renewal_script }}
- mode: 755
{% if grains["os_family"] == "FreeBSD" %}
/usr/local/etc/periodic/daily/730.letsencrypt:
file.managed:
- - source: salt://roles/core/certificates/files/730.letsencrypt
+ - source: salt://roles/core/certificates/files/certbot/periodic/730.letsencrypt
{% endif %}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Oct 7, 13:03 (17 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3054908
Default Alt Text
D3731.diff (11 KB)
Attached To
Mode
D3731: Sort acme.sh and certbot files
Attached
Detach File
Event Timeline
Log In to Comment