Change challenge directory

9 years ago · 88890c22fd
parent be96984d48
commit 88890c22fd
9 changed files with 9 additions and 9 deletions
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80LetsencryptChallengeDir
@ -2,7 +2,7 @@
  if (($letsencrypt{'status'} || 'disabled') eq 'enabled'){
    $OUT .=<<"_EOF";

-<Directory /var/lib/letsencrypt.sh>
+<Directory /var/lib/letsencrypt.sh/challenges>
    Options None
    AllowOverride None
    Order deny,allow
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Ejabberd/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPManager/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPPortal/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/LemonLDAPSoap/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/UserManagerVirtualHost/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/80Letsencrypt
@ -1,7 +1,7 @@
 {
  if (($domain->prop('Letsencrypt') || 'enabled') ne 'disabled' && ((${'httpd-e-smith'}{'TCPPort'} || '80') eq $port)){
    $OUT .=<<"_EOF";
-    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/
+    Alias /.well-known/acme-challenge/ /var/lib/letsencrypt.sh/challenges/
    <Location /.well-known/acme-challenge/>
      Allow from all
    </Location>
--- a/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown
+++ b/root/etc/e-smith/templates/etc/letsencrypt.sh/config.sh/30WellKnown
@ -1 +1 @@
-WELLKNOWN=/var/lib/letsencrypt.sh/
+WELLKNOWN=/var/lib/letsencrypt.sh/challenges