diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | consfigurator.asd | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | doc/conf.py | 4 | ||||
| -rw-r--r-- | doc/news.rst | 9 | ||||
| -rw-r--r-- | emacs/consfigurator.el.in | 2 | ||||
| -rw-r--r-- | src/property/apache.lisp | 9 |
8 files changed, 29 insertions, 9 deletions
@@ -77,7 +77,7 @@ regarding the reporting of bugs and submission of patches/pull requests. License ======= -| Copyright (C) 2015-2018, 2020-2022 Sean Whitton +| Copyright (C) 2015-2018, 2020-2024 Sean Whitton | Copyright (C) 2021-2022 David Bremner Consfigurator is free software: you can redistribute it and/or modify it under diff --git a/consfigurator.asd b/consfigurator.asd index ecb8a29..fbdffb3 100644 --- a/consfigurator.asd +++ b/consfigurator.asd @@ -1,6 +1,6 @@ (defsystem "consfigurator" :description "Lisp declarative configuration management system" - :version "1.3.1" + :version "1.3.2" :author "Sean Whitton <spwhitton@spwhitton.name>" :licence "GPL-3+" :serial t @@ -103,7 +103,7 @@ (defsystem "consfigurator/tests" :description "Tests for Consfigurator, Lisp declarative configuration management system" - :version "1.3.1" + :version "1.3.2" :author "Sean Whitton <spwhitton@spwhitton.name>" :licence "GPL-3+" :serial t diff --git a/debian/changelog b/debian/changelog index 599a188..2483a6d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +consfigurator (1.3.2-1) unstable; urgency=medium + + * New upstream release. + + -- Sean Whitton <spwhitton@spwhitton.name> Wed, 24 Apr 2024 08:34:43 +0100 + consfigurator (1.3.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/copyright b/debian/copyright index f0241b2..6411817 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Consfigurator Lisp declarative configuration management system -Copyright (C)2015-2018, 2020-2023 Sean Whitton +Copyright (C)2015-2018, 2020-2024 Sean Whitton Copyright (C)2021-2022 David Bremner Copyright (C)2002-2023 Free Software Foundation, Inc. diff --git a/doc/conf.py b/doc/conf.py index 689487f..7a02cee 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -18,11 +18,11 @@ # -- Project information ----------------------------------------------------- project = 'Consfigurator' -copyright = '2015-2018, 2020-2023, Sean Whitton, 2021-2022 David Bremner' +copyright = '2015-2018, 2020-2024, Sean Whitton, 2021-2022 David Bremner' author = 'Sean Whitton' # The full version, including alpha/beta/rc tags -release = '1.3.1' +release = '1.3.2' # -- General configuration --------------------------------------------------- diff --git a/doc/news.rst b/doc/news.rst index ba5e5d8..d4b19f1 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -23,7 +23,14 @@ In summary, you should always be able to upgrade to a release which only increments ``patch``, but if either of the other two components have changed, you should review this document and see if your consfig needs updating. -1.3.2 (unreleased) +1.3.3 (unreleased) +------------------ + +- APACHE:HTTPS-VHOST now adds an Apache ``<Directory>`` directive which + ensures that HTTP access to the ``.well-known/acme-challenge/`` subdirectory + of the document root is granted. + +1.3.2 (2024-04-24) ------------------ - Add LIBVIRT:KVM-BOOTS-LVM-LV and LIBVIRT:KVM-BOOTS-LVM-LV-FOR. diff --git a/emacs/consfigurator.el.in b/emacs/consfigurator.el.in index 7e5de7a..35685ea 100644 --- a/emacs/consfigurator.el.in +++ b/emacs/consfigurator.el.in @@ -5,7 +5,7 @@ ;; Author: Sean Whitton <spwhitton@spwhitton.name> ;; Maintainer: Sean Whitton <spwhitton@spwhitton.name> -;; Version: 1.3.1 +;; Version: 1.3.2 ;; URL: https://git.spwhitton.name/consfigurator/tree/emacs/consfigurator.el.in ;; Keywords: languages, lisp, syntax, unix diff --git a/src/property/apache.lisp b/src/property/apache.lisp index b299a20..56d0a16 100644 --- a/src/property/apache.lisp +++ b/src/property/apache.lisp @@ -1,6 +1,6 @@ ;;; Consfigurator -- Lisp declarative configuration management system -;;; Copyright (C) 2021 Sean Whitton <spwhitton@spwhitton.name> +;;; Copyright (C) 2021, 2024 Sean Whitton <spwhitton@spwhitton.name> ;;; This file is free software; you can redistribute it and/or modify ;;; it under the terms of the GNU General Public License as published by @@ -137,6 +137,13 @@ restart Apache." ,@initial "RewriteEngine On" "RewriteRule ^/.well-known/acme-challenge.* - [L]" + ,(format nil "<Directory ~A>" + (unix-namestring + (merge-pathnames + #P".well-known/acme-challenge/" + (ensure-directory-pathname htdocs)))) + "Require all granted" + "</Directory>" ,@additional-config ;; redirect everything else to https "RewriteRule (.*) https://%{SERVER_NAME}$1 [R=301,L,NE]" |