[task-393]

This reverts commit ae35b71940.

README.md

@@ -1,4 +1,4 @@
-# Ansible Collection - linke.standard
+# Ansible Collection - roydfalk.standard
 
 Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
 
@@ -14,6 +14,10 @@ Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
 ### Rollen
 
 - sollen jeweils eine Info-Datei enthalten (`roles/<rollen-name>/info.md`), in welcher kurz der Zweck der Rolle beschrieben, mögliche Besonderheiten für die Verwendung erklärt und nützliche Angaben wie Netz-Verweise aufgeführt werden
+- sollen jeweils eine Variablen-Deklarations-Datei enthalten (`roles/<rollen-name>/vardef.json`), in welcher für alle verfügbaren Variablen folgende Angaben festgehalten werden sollen:
+	- Typ in [JSON-Schema](https://json-schema.org/)-Syntax
+	- bei Aufzählungs-Typen: die zulässigen Werte
+	- optional: Erläuterung
 
 
 #### Namen
@@ -28,7 +32,7 @@ Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
 
 - sollen nach folgendem Muster benannt sein: `var_<rollen-name>_<bezeichnung>`, wobei `<bezeichnung>` aussagekräftig sein soll (z.B. `server_port` statt `x1`)
 - sollen mit sinnvollen Standard-Werten belegt werden
-- sollen aufgelistet/angekündigt/deklariert 
+- sollen aufgelistet/angekündigt/deklariert werden (`vardef.json`)
 - sollen möglichst primitiv sein, d.h. nur Wahrheits-Werte, Zahlen und (einfache) Zeichenketten
 
 
@@ -48,3 +52,4 @@ Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen
 ## ToDo
 
 - [Blocks](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_blocks.html) verwenden
+- [Handlers](https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_handlers.html) verwenden

galaxy.yml

@@ -2,10 +2,10 @@
 # The namespace of the collection. This can be a company/brand/organization or product namespace under which all
 # content lives. May only contain alphanumeric lowercase characters and underscores. Namespaces cannot start with
 # underscores or numbers and cannot contain consecutive underscores
-namespace: linke
+namespace: fenris 
 
 # The name of the collection. Has the same character restrictions as 'namespace'
-name: standard
+name: base 
 
 # The version of the collection. Must be compatible with semantic versioning
 version: 1.0.0
@@ -16,22 +16,18 @@ readme: README.md
 # A list of the collection's content authors. Can be just the name or in the format 'Full Name <email> (url)
 # @nicks:irc/im.site#channel'
 authors:
-- Royd Falk <roydfalk@folksprak.org>
+- Fenris <fenris@folksprak.org>
-
+- Marius <marius@rasumi.net>
 
 ### OPTIONAL but strongly recommended
 # A short summary description of the collection
-description: "Sammlung von Rollen für die Partei 'Die Linke'"
+description: "Sammlung von allgemeinen, wiederverwendbaren Ansible-Rollen"
 
 # Either a single license or a list of licenses for content inside of a collection. Ansible Galaxy currently only
 # accepts L(SPDX,https://spdx.org/licenses/) licenses. This key is mutually exclusive with 'license_file'
 license:
 - GPL-3.0-or-later
 
-# The path to the license file for the collection. This path is relative to the root of the collection. This key is
-# mutually exclusive with 'license'
-license_file: ''
-
 # A list of tags you want to associate with the collection for indexing/searching. A tag name has the same character
 # requirements as 'namespace' and 'name'
 tags: []

gpl-3.0.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

license.txt

@@ -0,0 +1 @@
+gpl-3.0.txt

roles/authelia-and-nginx/cfg.schema.json

@@ -0,0 +1,24 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"tls_mode": {
+			"nullable": false,
+			"type": "string",
+			"options": [
+				"disable",
+				"enable",
+				"force"
+			],
+			"enum": "force"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"domain"
+	]
+}

roles/authelia-and-nginx/defaults/main.json

@@ -1,3 +1,5 @@
 {
-	"var_authelia_and_nginx_domain": "authelia.example.org"
+	"cfg_authelia_and_nginx_defaults": {
+		"tls_mode": "force"
+	}
 }

roles/authelia-and-nginx/tasks/main.json

@@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_authelia_and_nginx"
+		}
+	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@@ -12,7 +19,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}"
 		}
 	},
 	{
@@ -20,8 +27,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}",
+			"src": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_authelia_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{cfg_authelia_and_nginx.domain}}"
 		}
 	},
 	{

roles/authelia-and-nginx/templates/conf.j2

@@ -1,22 +1,4 @@
-server {
+{% macro authelia_common() %}
-	server_name {{var_authelia_and_nginx_domain}};
-	
-	listen [::]:80;
-	listen 80;
-	
-	return 301 https://$server_name$request_uri;
-}
-
-server {
-	server_name {{var_authelia_and_nginx_domain}};
-	
-	listen [::]:443 ssl http2;
-	listen 443 ssl http2;
-	
-	ssl_certificate /etc/ssl/fullchains/{{var_authelia_and_nginx_domain}}.pem;
-	ssl_certificate_key /etc/ssl/private/{{var_authelia_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-	
 	location / {
 		## Headers
 		proxy_set_header Host $host;
@@ -28,7 +10,7 @@ server {
 		proxy_set_header X-Forwarded-For $remote_addr;
 		proxy_set_header X-Real-IP $remote_addr;
 		proxy_set_header Connection "";
-
+		
 		## Basic Proxy Configuration
 		client_body_buffer_size 128k;
 		proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; ## Timeout if the real server is dead.
@@ -37,7 +19,7 @@ server {
 		proxy_cache_bypass $cookie_session;
 		proxy_no_cache $cookie_session;
 		proxy_buffers 64 256k;
-
+		
 		## Trusted Proxies Configuration
 		## Please read the following documentation before configuring this:
 		##     https://www.authelia.com/integration/proxies/nginx/#trusted-proxies
@@ -47,7 +29,7 @@ server {
 		# set_real_ip_from fc00::/7;
 		real_ip_header X-Forwarded-For;
 		real_ip_recursive on;
-
+		
 		## Advanced Proxy Configuration
 		send_timeout 5m;
 		proxy_read_timeout 360;
@@ -60,4 +42,32 @@ server {
 	location /api/verify {
 		proxy_pass http://localhost:9091;
 	}
+{% endmacro %}
+
+server {
+	server_name {{cfg_authelia_and_nginx.domain}};
+	
+	listen 80;
+	listen [::]:80;
+	
+{% if (cfg_authelia_and_nginx.tls_mode == 'force') %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ authelia_common() }}
+{% endif %}
 }
+
+{% if (cfg_authelia_and_nginx.tls_mode != 'disable') %}
+server {
+	server_name {{cfg_authelia_and_nginx.domain}};
+	
+	listen [::]:443 ssl http2;
+	listen 443 ssl http2;
+	
+	ssl_certificate_key /etc/ssl/private/{{cfg_authelia_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_authelia_and_nginx.domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ authelia_common() }}
+}
+{% endif %}

roles/authelia-for-dokuwiki/tasks/main.json

@@ -1,4 +1,12 @@
 [
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_dokuwiki_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_dokuwiki_client_secret_hashed"
+	},
 	{
 		"name": "configuration | emplace",
 		"become": true,

roles/authelia-for-dokuwiki/templates/authelia-client-conf.json.j2

@@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_dokuwiki_client_id}}",
-	"client_secret": "{{var_authelia_for_dokuwiki_client_secret}}",
+	"client_secret": "{{temp_authelia_for_dokuwiki_client_secret_hashed.stdout}}",
 	"client_name": "DokuWiki",
 	"public": false,
 	"authorization_policy": "one_factor",

roles/authelia-for-forgejo/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_authelia_for_forgejo_forgejo_url_base": "https://forgejo.example.org",
+	"var_authelia_for_forgejo_client_id": "forgejo",
+	"var_authelia_for_forgejo_client_secret": "REPLACE_ME"
+}

roles/authelia-for-forgejo/info.md

@@ -0,0 +1,9 @@
+## Beschreibung
+
+Um [Forgejo](../forgejo) gegen [Authelia](../authelia) authentifizieren zu lassen
+
+
+## Verweise
+
+- [Forgejo-Dokumentation | Configuration | OpenID](https://forgejo.org/docs/latest/admin/config-cheat-sheet/#openid-openid)
+- [Authelia-Dokumentation | Gitea Integration](https://www.authelia.com/integration/openid-connect/gitea/)

roles/authelia-for-forgejo/tasks/main.json

@@ -0,0 +1,33 @@
+[
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_forgejo_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_forgejo_client_secret_hashed"
+	},
+	{
+		"name": "configuration | emplace",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "authelia-client-conf.json.j2",
+			"dest": "/etc/authelia/conf.d/clients/forgejo.json"
+		}
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

roles/authelia-for-forgejo/templates/authelia-client-conf.json.j2

@@ -0,0 +1,17 @@
+{
+	"client_id": "{{var_authelia_for_forgejo_client_id}}",
+	"client_secret": "{{temp_authelia_for_forgejo_client_secret_hashed.stdout}}",
+	"client_name": "Forgejo",
+	"public": false,
+	"authorization_policy": "one_factor",
+	"redirect_uris": [
+		"{{var_authelia_for_forgejo_forgejo_url_base}}/user/oauth2/authelia/callback"
+	],
+	"scopes": [
+		"openid",
+		"email",
+		"profile"
+	],
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-gitlab/tasks/main.json

@@ -1,4 +1,12 @@
 [
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_gitlab_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_gitlab_client_secret_hashed"
+	},
 	{
 		"name": "configuration | emplace",
 		"become": true,

roles/authelia-for-gitlab/templates/authelia-client-conf.json.j2

@@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_gitlab_client_id}}",
-	"client_secret": "{{var_authelia_for_gitlab_client_secret}}",
+	"client_secret": "{{temp_authelia_for_gitlab_client_secret_hashed.stdout}}",
 	"client_name": "GitLab",
 	"public": false,
 	"authorization_policy": "one_factor",

roles/authelia-for-hedgedoc/cfg.schema.json

@@ -0,0 +1,25 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"hedgedoc_url_base": {
+			"nullable": false,
+			"type": "string"
+		},
+		"client_id": {
+			"nullable": false,
+			"type": "string",
+			"default": "hedgedoc"
+		},
+		"client_secret": {
+			"nullable": false,
+			"type": "string"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"hedgedoc_url_base",
+		"client_id",
+		"client_secret"
+	]
+}

roles/authelia-for-hedgedoc/defaults/main.json

@@ -1,5 +1,5 @@
 {
-	"var_authelia_for_hedgedoc_hedgedoc_url_base": "https://hedgedoc.example.org",
+	"cfg_authelia_for_hedgedoc_defaults": {
-	"var_authelia_for_hedgedoc_client_id": "hedgedoc",
+		"client_id": "hedgedoc"
-	"var_authelia_for_hedgedoc_client_secret": "REPLACE_ME"
+	}
 }

roles/authelia-for-hedgedoc/tasks/main.json

@@ -1,4 +1,19 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_authelia_for_hedgedoc"
+		}
+	},
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_hedgedoc.client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_hedgedoc_client_secret_hashed"
+	},
 	{
 		"name": "configuration | emplace",
 		"become": true,

roles/authelia-for-hedgedoc/templates/authelia-client-conf.json.j2

@@ -1,6 +1,6 @@
 {
-	"client_id": "{{var_authelia_for_hedgedoc_client_id}}",
+	"client_id": "{{cfg_authelia_for_hedgedoc.client_id}}",
-	"client_secret": "{{var_authelia_for_hedgedoc_client_secret}}",
+	"client_secret": "{{temp_authelia_for_hedgedoc_client_secret_hashed.stdout}}",
 	"client_name": "Hedgedoc",
 	"public": false,
 	"authorization_policy": "one_factor",
@@ -10,11 +10,7 @@
 		"profile"
 	],
 	"redirect_uris": [
-		"{{var_authelia_for_hedgedoc_hedgedoc_url_base}}/auth/oauth2/callback"
+		"{{cfg_authelia_for_hedgedoc.hedgedoc_url_base}}/auth/oauth2/callback"
-	],
-	"grant_types": [
-		"refresh_token",
-		"authorization_code"
 	],
 	"response_types": [
 		"code"

roles/authelia-for-owncloud/cfg.schema.json

@@ -0,0 +1,97 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"owncloud_url_base": {
+			"nullable": false,
+			"type": "string"
+		},
+		"web": {
+			"nullable": true,
+			"type": "object",
+			"properties": {
+				"client_id": {
+					"nullable": false,
+					"type": "string",
+					"default": "owncloud_web"
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+			],
+			"default": {
+			}
+		},
+		"desktop": {
+			"nullable": true,
+			"type": "object",
+			"properties": {
+				"client_id": {
+					"nullable": false,
+					"type": "string",
+					"default": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69"
+				},
+				"client_secret": {
+					"nullable": false,
+					"type": "string",
+					"default": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+			],
+			"default": {
+			}
+		},
+		"android": {
+			"nullable": true,
+			"type": "object",
+			"properties": {
+				"client_id": {
+					"nullable": false,
+					"type": "string",
+					"default": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD"
+				},
+				"client_secret": {
+					"nullable": false,
+					"type": "string",
+					"default": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+			],
+			"default": {
+			}
+		},
+		"ios": {
+			"nullable": true,
+			"type": "object",
+			"properties": {
+				"client_id": {
+					"nullable": false,
+					"type": "string",
+					"default": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1"
+				},
+				"client_secret": {
+					"nullable": false,
+					"type": "string",
+					"default": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+			],
+			"default": {
+			}
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"owncloud_url_base",
+		"web",
+		"desktop",
+		"android",
+		"ios"
+	]
+}

roles/authelia-for-owncloud/defaults/main.json

@@ -0,0 +1,19 @@
+{
+	"cfg_authelia_for_owncloud_defaults": {
+		"web": {
+			"client_id": "owncloud_web"
+		},
+		"desktop": {
+			"client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
+			"client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
+		},
+		"android": {
+			"client_id": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD",
+			"client_secret": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
+		},
+		"ios": {
+			"client_id": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1",
+			"client_secret": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
+		}
+	}
+}

roles/authelia-for-owncloud/info.md

@@ -0,0 +1,10 @@
+## Beschreibung
+
+Um [ownCloud](../owncloud) gegen [Authelia](../authelia) authentifizieren zu lassen
+
+
+## Verweise
+
+- [Authelia-Dokumentation | ownCloud Infinite Scale Integration](https://www.authelia.com/integration/openid-connect/ocis/)
+- [Helge Klein | SSO via Authelia: ownCloud OpenID Connect Authentication](https://helgeklein.com/blog/owncloud-infinite-scale-with-openid-connect-authentication-for-home-networks/#sso-via-authelia-owncloud-openid-connect-authentication)
+- [ownCloud Forums | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222)

roles/authelia-for-owncloud/tasks/main.json

@@ -0,0 +1,109 @@
+[
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_authelia_for_owncloud"
+		}
+	},
+	{
+		"name": "configuration | client",
+		"block": [
+			{
+				"name": "configuration | client | web",
+				"when": "cfg_authelia_for_owncloud.web != None",
+				"block": [
+					{
+						"name": "emplace",
+						"become": true,
+						"ansible.builtin.template": {
+							"src": "authelia-client-conf-web.json.j2",
+							"dest": "/etc/authelia/conf.d/clients/owncloud-web.json"
+						}
+					}
+				]
+			},
+			{
+				"name": "configuration | client | desktop",
+				"when": "cfg_authelia_for_owncloud.desktop != None",
+				"block": [
+					{
+						"name": "compute client secret hash",
+						"become": true,
+						"ansible.builtin.shell": {
+							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.desktop.client_secret}} | cut --delimiter=' ' --fields='2-'"
+						},
+						"register": "temp_authelia_for_owncloud_desktop_client_secret_hashed"
+					},
+					{
+						"name": "emplace",
+						"become": true,
+						"ansible.builtin.template": {
+							"src": "authelia-client-conf-desktop.json.j2",
+							"dest": "/etc/authelia/conf.d/clients/owncloud-desktop.json"
+						}
+					}
+				]
+			},
+			{
+				"name": "configuration | client | android",
+				"when": "cfg_authelia_for_owncloud.android != None",
+				"block": [
+					{
+						"name": "compute client secret hash",
+						"become": true,
+						"ansible.builtin.shell": {
+							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.android.client_secret}} | cut --delimiter=' ' --fields='2-'"
+						},
+						"register": "temp_authelia_for_owncloud_android_client_secret_hashed"
+					},
+					{
+						"name": "emplace",
+						"become": true,
+						"ansible.builtin.template": {
+							"src": "authelia-client-conf-android.json.j2",
+							"dest": "/etc/authelia/conf.d/clients/owncloud-android.json"
+						}
+					}
+				]
+			},
+			{
+				"name": "configuration | client | ios",
+				"when": "cfg_authelia_for_owncloud.ios != None",
+				"block": [
+					{
+						"name": "compute client secret hash",
+						"become": true,
+						"ansible.builtin.shell": {
+							"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.ios.client_secret}} | cut --delimiter=' ' --fields='2-'"
+						},
+						"register": "temp_authelia_for_owncloud_ios_client_secret_hashed"
+					},
+					{
+						"name": "emplace",
+						"become": true,
+						"ansible.builtin.template": {
+							"src": "authelia-client-conf-ios.json.j2",
+							"dest": "/etc/authelia/conf.d/clients/owncloud-ios.json"
+						}
+					}
+				]
+			}
+		]
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

roles/authelia-for-owncloud/templates/authelia-client-conf-android.json.j2

@@ -0,0 +1,33 @@
+{
+	"client_id": "{{cfg_authelia_for_owncloud.android.client_id}}",
+	"client_secret": "{{temp_authelia_for_owncloud_android_client_secret_hashed.stdout}}",
+	"client_name": "ownCloud | Android Client",
+	
+	"public": false,
+	"authorization_policy": "one_factor",
+	"require_pkce": true,
+	"pkce_challenge_method": "S256",
+	"scopes": [
+		"openid",
+		"offline_access",
+		"groups",
+		"profile",
+		"email"
+	],
+	"redirect_uris": [
+		"oc://android.owncloud.com"
+		
+		
+		
+	],
+	"response_types": [
+		"code"
+	],
+	"grant_types": [
+		"authorization_code",
+		"refresh_token"
+	],
+	"access_token_signed_response_alg": "none",
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2

@@ -0,0 +1,33 @@
+{
+	"client_id": "{{cfg_authelia_for_owncloud.desktop.client_id}}",
+	"client_secret": "{{temp_authelia_for_owncloud_desktop_client_secret_hashed.stdout}}",
+	"client_name": "ownCloud | Desktop Client",
+	
+	"public": false,
+	"authorization_policy": "one_factor",
+	"require_pkce": true,
+	"pkce_challenge_method": "S256",
+	"scopes": [
+		"openid",
+		"offline_access",
+		"groups",
+		"profile",
+		"email"
+	],
+	"redirect_uris": [
+		"http://127.0.0.1",
+		"http://localhost"
+		
+		
+	],
+	"response_types": [
+		"code"
+	],
+	"grant_types": [
+		"authorization_code",
+		"refresh_token"
+	],
+	"access_token_signed_response_alg": "none",
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-owncloud/templates/authelia-client-conf-ios.json.j2

@@ -0,0 +1,33 @@
+{
+	"client_id": "{{cfg_authelia_for_owncloud.ios.client_id}}",
+	"client_secret": "{{temp_authelia_for_owncloud_ios_client_secret_hashed.stdout}}",
+	"client_name": "ownCloud | iOS Client",
+	
+	"public": false,
+	"authorization_policy": "one_factor",
+	"require_pkce": true,
+	"pkce_challenge_method": "S256",
+	"scopes": [
+		"openid",
+		"offline_access",
+		"groups",
+		"profile",
+		"email"
+	],
+	"redirect_uris": [
+		"oc://ios.owncloud.com",
+		"oc.ios://ios.owncloud.com"
+		
+		
+	],
+	"response_types": [
+		"code"
+	],
+	"grant_types": [
+		"authorization_code",
+		"refresh_token"
+	],
+	"access_token_signed_response_alg": "none",
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-owncloud/templates/authelia-client-conf-web.json.j2

@@ -0,0 +1,33 @@
+{
+	"client_id": "{{cfg_authelia_for_owncloud.web.client_id}}",
+	
+	"client_name": "ownCloud | Web Client",
+	"lifespan": "long",
+	"public": true,
+	"authorization_policy": "one_factor",
+	"require_pkce": true,
+	"pkce_challenge_method": "S256",
+	"scopes": [
+		"openid",
+		"offline_access",
+		"groups",
+		"profile",
+		"email"
+	],
+	"redirect_uris": [
+		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}",
+		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-callback.html",
+		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-silent-redirect.html",
+		"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/apps/openidconnect/redirect"
+	],
+	"response_types": [
+		"code"
+	],
+	"grant_types": [
+		"authorization_code",
+		"refresh_token"
+	],
+	"access_token_signed_response_alg": "none",
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "none"
+}

roles/authelia-for-synapse/tasks/main.json

@@ -1,4 +1,12 @@
 [
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_synapse_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_synapse_client_secret_hashed"
+	},
 	{
 		"name": "configuration | emplace",
 		"become": true,

roles/authelia-for-synapse/templates/authelia-client-conf.json.j2

@@ -1,6 +1,6 @@
 {
 	"client_id": "{{var_authelia_for_synapse_client_id}}",
-	"client_secret": "{{var_authelia_for_synapse_client_secret}}",
+	"client_secret": "{{temp_authelia_for_synapse_client_secret_hashed.stdout}}",
 	"client_name": "Synapse",
 	"public": false,
 	"authorization_policy": "one_factor",

roles/authelia-for-tandoor/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_authelia_for_tandoor_tandoor_url_base": "https://tandoor.example.org",
+	"var_authelia_for_tandoor_client_id": "tandoor",
+	"var_authelia_for_tandoor_client_secret": "REPLACE_ME"
+}

roles/authelia-for-tandoor/info.md

@@ -0,0 +1,8 @@
+## Beschreibung
+
+Um [Tandoor](../tandoor) gegen [Authelia](../authelia) authentifizieren zu lassen
+
+
+## Verweise
+
+- [allauth-Dokumentation | Authelia](https://django-allauth.readthedocs.io/en/latest/socialaccount/providers/authelia.html)

roles/authelia-for-tandoor/tasks/main.json

@@ -0,0 +1,33 @@
+[
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_tandoor_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_tandoor_client_secret_hashed"
+	},
+	{
+		"name": "configuration | emplace",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "authelia-client-conf.json.j2",
+			"dest": "/etc/authelia/conf.d/clients/tandoor.json"
+		}
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

roles/authelia-for-tandoor/templates/authelia-client-conf.json.j2

@@ -0,0 +1,17 @@
+{
+	"client_id": "{{var_authelia_for_tandoor_client_id}}",
+	"client_secret": "{{temp_authelia_for_tandoor_client_secret_hashed.stdout}}",
+	"client_name": "Tandoor",
+	"public": false,
+	"authorization_policy": "one_factor",
+	"redirect_uris": [
+		"{{var_authelia_for_tandoor_tandoor_url_base}}/accounts/oidc/authelia/login/callback/"
+	],
+	"scopes": [
+		"openid",
+		"email",
+		"profile"
+	],
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-vikunja/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_authelia_for_vikunja_vikunja_url_base": "https://vikunja.example.org",
+	"var_authelia_for_vikunja_client_id": "vikunja",
+	"var_authelia_for_vikunja_client_secret": "REPLACE_ME"
+}

roles/authelia-for-vikunja/info.md

@@ -0,0 +1,10 @@
+## Beschreibung
+
+Um [Vikunja](../vikunja) gegen [Authelia](../authelia) authentifizieren zu lassen
+
+
+## Verweise
+
+- [Vikunja-Dokumentation | OpenID](https://vikunja.io/docs/openid/)
+- [Vikunja-Dokumentation | OpenID example configurations for Authelia](https://vikunja.io/docs/openid-example-configurations/#authelia)
+- [Authelia-Dokumentation | Vikunja Integration](https://www.authelia.com/integration/openid-connect/vikunja/)

roles/authelia-for-vikunja/tasks/main.json

@@ -0,0 +1,33 @@
+[
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_vikunja_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_vikunja_client_secret_hashed"
+	},
+	{
+		"name": "configuration | emplace",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "authelia-client-conf.json.j2",
+			"dest": "/etc/authelia/conf.d/clients/vikunja.json"
+		}
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

roles/authelia-for-vikunja/templates/authelia-client-conf.json.j2

@@ -0,0 +1,17 @@
+{
+	"client_id": "{{var_authelia_for_vikunja_client_id}}",
+	"client_secret": "{{temp_authelia_for_vikunja_client_secret_hashed.stdout}}",
+	"client_name": "Vikunja",
+	"public": false,
+	"authorization_policy": "one_factor",
+	"redirect_uris": [
+		"{{var_authelia_for_vikunja_vikunja_url_base}}/auth/openid/authelia"
+	],
+	"scopes": [
+		"openid",
+		"email",
+		"profile"
+	],
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_basic"
+}

roles/authelia-for-wiki_js/defaults/main.json

@@ -0,0 +1,6 @@
+{
+	"var_authelia_for_wiki_js_wiki_js_url_base": "https://wiki-js.example.org",
+	"var_authelia_for_wiki_js_client_id": "wiki_js",
+	"var_authelia_for_wiki_js_client_secret": "REPLACE_ME",
+	"var_authelia_for_wiki_js_strategy_id": "authelia"
+}

roles/authelia-for-wiki_js/info.md

@@ -0,0 +1,9 @@
+## Beschreibung
+
+Um [Wiki.js](../wiki.js) gegen [Authelia](../authelia) authentifizieren zu lassen
+
+
+## Verweise
+
+[Wiki.js-Dokumentation | Authentication](https://docs.requarks.io/auth)
+[Authelia-Dokumentation | Wiki.js Integration](https://www.authelia.com/integration/openid-connect/wikijs/)

roles/authelia-for-wiki_js/tasks/main.json

@@ -0,0 +1,33 @@
+[
+	{
+		"name": "configuration | compute client secret hash",
+		"become": true,
+		"ansible.builtin.shell": {
+			"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_wiki_js_client_secret}} | cut --delimiter=' ' --fields='2-'"
+		},
+		"register": "temp_authelia_for_wiki_js_client_secret_hashed"
+	},
+	{
+		"name": "configuration | emplace",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "authelia-client-conf.json.j2",
+			"dest": "/etc/authelia/conf.d/clients/wiki_js.json"
+		}
+	},
+	{
+		"name": "configuration | apply",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "/usr/bin/authelia-conf-compose"
+		}
+	},
+	{
+		"name": "restart service",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "authelia"
+		}
+	}
+]

roles/authelia-for-wiki_js/templates/authelia-client-conf.json.j2

@@ -0,0 +1,17 @@
+{
+	"client_id": "{{var_authelia_for_wiki_js_client_id}}",
+	"client_secret": "{{temp_authelia_for_wiki_js_client_secret_hashed.stdout}}",
+	"client_name": "Wiki.js",
+	"public": false,
+	"authorization_policy": "one_factor",
+	"redirect_uris": [
+		"{{var_authelia_for_wiki_js_wiki_js_url_base}}/login/{{var_authelia_for_wiki_js_strategy_id}}/callback"
+	],
+	"scopes": [
+		"openid",
+		"email",
+		"profile"
+	],
+	"userinfo_signed_response_alg": "none",
+	"token_endpoint_auth_method": "client_secret_post"
+}

roles/authelia/cfg.schema.json

@@ -0,0 +1,449 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"listen_address": {
+			"nullable": false,
+			"type": "string",
+			"default": "0.0.0.0"
+		},
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"session_domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"redirect_url": {
+			"nullable": false,
+			"type": "string"
+		},
+		"jwt_secret": {
+			"nullable": false,
+			"type": "string"
+		},
+		"session_secret": {
+			"nullable": false,
+			"type": "string"
+		},
+		"storage_encryption_key": {
+			"nullable": false,
+			"type": "string"
+		},
+		"users_file_path": {
+			"nullable": false,
+			"type": "string",
+			"default": "/var/authelia/users.yml"
+		},
+		"log_file_path": {
+			"nullable": false,
+			"type": "string",
+			"default": "/var/authelia/log.jsonl"
+		},
+		"storage": {
+			"anyOf": [
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["sqlite"],
+							"default": "sqlite"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"path": {
+									"nullable": false,
+									"type": "string",
+									"default": "/var/authelia/state.db"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"path"
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					],
+					"default": {
+					}
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["postgresql"]
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"host": {
+									"nullable": false,
+									"type": "string",
+									"ddefault": "localhost"
+								},
+								"port": {
+									"nullable": false,
+									"type": "integer",
+									"default": 5432
+								},
+								"username": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia_user"
+								},
+								"password": {
+									"nullable": false,
+									"type": "string"
+								},
+								"schema": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"host",
+								"port",
+								"username",
+								"password",
+								"schema"
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					],
+					"default": {
+					}
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["mariadb"]
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"host": {
+									"nullable": false,
+									"type": "string",
+									"ddefault": "localhost"
+								},
+								"port": {
+									"nullable": false,
+									"type": "integer",
+									"default": 3306
+								},
+								"username": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia_user"
+								},
+								"password": {
+									"nullable": false,
+									"type": "string"
+								},
+								"schema": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"host",
+								"port",
+								"username",
+								"password",
+								"schema"
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					],
+					"default": {
+					}
+				}
+			]
+		},
+		"ntp_server": {
+			"nullable": false,
+			"type": "string",
+			"default": "time.cloudflare.com:123"
+		},
+		"password_reset": {
+			"nullable": false,
+			"type": "object",
+			"properties": {
+				"enabled": {
+					"nullable": false,
+					"type": "boolean",
+					"default": false
+				},
+				"custom_url": {
+					"nullable": true,
+					"type": "string",
+					"default": null
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+				"enabled",
+				"custom_url"
+			],
+			"default": {
+			}
+		},
+		"notification": {
+			"anyOf": [
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["file"],
+							"default": "file"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"path": {
+									"nullable": false,
+									"type": "string",
+									"default": "/var/authelia/notifications"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"path"
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					],
+					"default": {
+					}
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["smtp"],
+							"default": "smtp"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"host": {
+									"nullable": false,
+									"type": "string"
+								},
+								"port": {
+									"nullable": false,
+									"type": "integer",
+									"default": 465
+								},
+								"username": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia"
+								},
+								"password": {
+									"nullable": false,
+									"type": "string"
+								},
+								"sender": {
+									"nullable": false,
+									"type": "string",
+									"default": "authelia@example.org"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"host",
+								"port",
+								"username",
+								"password",
+								"sender"
+							]
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					],
+					"default": {
+					}
+				}
+			]
+		},
+		"oidc": {
+			"nullable": false,
+			"type": "object",
+			"properties": {
+				"hmac_secret": {
+					"nullable": false,
+					"type": "string"
+				},
+				"lifespan": {
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"default": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"access_token": {
+									"nullable": false,
+									"type": "string",
+									"default": "1h"
+								},
+								"refresh_token": {
+									"nullable": false,
+									"type": "string",
+									"default": "1m"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+							],
+							"default": {
+							}
+						},
+						"custom": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+							},
+							"additionalProperties": {
+								"nullable": false,
+								"type": "object",
+								"properties": {
+									"access_token": {
+										"nullable": false,
+										"type": "string"
+									},
+									"refresh_token": {
+										"nullable": false,
+										"type": "string"
+									}
+								},
+								"additionalProperties": false,
+								"required": [
+									"access_token",
+									"refresh_token"
+								]
+							},
+							"required": [
+							],
+							"default": {
+								"long": {
+									"access_token": "2d",
+									"refresh_token": "3d"
+								}
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+					],
+					"default": {
+					}
+				},
+				"cors_endpoints": {
+					"nullable": true,
+					"type": "array",
+					"items": {
+						"nullable": false,
+						"type": "string",
+						"enum": [
+							"authorization",
+							"pushed-authorization-request",
+							"token",
+							"revocation",
+							"introspection",
+							"userinfo"
+						]
+					},
+					"default": [
+						"authorization",
+						"token",
+						"revocation",
+						"introspection",
+						"userinfo"
+					]
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+				"hmac_secret",
+				"lifespan",
+				"cors_endpoints"
+			],
+			"default": {
+			}
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"listen_address",
+		"domain",
+		"session_domain",
+		"redirect_url",
+		"jwt_secret",
+		"session_secret",
+		"storage_encryption_key",
+		"users_file_path",
+		"log_file_path",
+		"storage",
+		"ntp_server",
+		"notification",
+		"oidc"
+	],
+	"default": {
+	}
+}

roles/authelia/defaults/main.json

@@ -1,36 +1,45 @@
 {
-	"var_authelia_version": "4.37.5",
+	"cfg_authelia_defaults": {
-	"var_authelia_architecture": "amd64",
+		"listen_address": "0.0.0.0",
-	"var_authelia_listen_address": "0.0.0.0",
+		"users_file_path": "/var/authelia/users.yml",
-	"var_authelia_jwt_secret": "REPLACE_ME",
+		"log_file_path": "/var/authelia/log.jsonl",
-	"var_authelia_users_file_path": "/var/authelia/users.yml",
+		"storage": {
-	"var_authelia_log_file_path": "/var/authelia/log.jsonl",
+			"kind": "sqlite",
-	"var_authelia_domain": "authelia.example.org",
+			"data": {
-	"var_authelia_redirect_url": "https://example.org",
+				"path": "/var/authelia/state.db"
-	"var_authelia_session_domain": "example.org",
+			}
-	"var_authelia_session_secret": "REPLACE_ME",
+		},
-	"var_authelia_storage_encryption_key": "REPLACE_ME",
+		"ntp_server": "time.cloudflare.com:123",
-	"var_authelia_storage_kind": "sqlite",
+		"password_reset": {
-	"var_authelia_storage_data_sqlite_path": "/var/authelia/state.db",
+			"enabled": false,
-	"var_authelia_storage_data_postgresql_host": "localhost",
+			"custom_url": null
-	"var_authelia_storage_data_postgresql_port": 5432,
+		},
-	"var_authelia_storage_data_postgresql_username": "authelia_user",
+		"notification": {
-	"var_authelia_storage_data_postgresql_password": "REPLACE_ME",
+			"kind": "file",
-	"var_authelia_storage_data_postgresql_schema": "authelia",
+			"data": {
-	"var_authelia_storage_data_mariadb_host": "localhost",
+				"path": "/var/authelia/notifications"
-	"var_authelia_storage_data_mariadb_port": 3306,
+			}
-	"var_authelia_storage_data_mariadb_username": "authelia_user",
+		},
-	"var_authelia_storage_data_mariadb_password": "REPLACE_ME",
+		"oidc": {
-	"var_authelia_storage_data_mariadb_schema": "authelia",
+			"lifespan": {
-	"var_authelia_ntp_server": "time.cloudflare.com:123",
+				"default": {
-	"var_authelia_password_reset_enabled": false,
+					"access_token": "1d",
-	"var_authelia_password_reset_custom_url": null,
+					"refresh_token": "1h"
-	"var_authelia_notification_mode": "smtp",
+				},
-	"var_authelia_notification_file_path": "/var/authelia/notifications",
+				"custom": {
-	"var_authelia_notification_smtp_host": "smtp.example.org",
+					"long": {
-	"var_authelia_notification_smtp_port": 465,
+						"access_token": "2d",
-	"var_authelia_notification_smtp_username": "authelia",
+						"refresh_token": "3d"
-	"var_authelia_notification_smtp_password": "REPLACE_ME",
+					}
-	"var_authelia_notification_smtp_sender": "authelia@example.org",
+				}
-	"var_authelia_oidc_hmac_secret": "REPLACE_ME"
+			},
+			"cors_endpoints": [
+				"authorization",
+				"token",
+				"revocation",
+				"introspection",
+				"userinfo"
+			]
+		}
+	}
 }

roles/authelia/info.md

@@ -12,6 +12,3 @@
 - [Dokumentation | Konfiguration](https://www.authelia.com/configuration/)
 
 
-## ToDo
-
-- Nutzer-Verwaltung verbessern (evtl. externalisieren)

roles/authelia/tasks/main.json

@@ -1,42 +1,57 @@
 [
 	{
-		"name": "packages | prerequisites",
+		"name": "show vars",
-		"become": true,
+		"when": "switch_show_vars",
-		"ansible.builtin.apt": {
+		"ansible.builtin.debug": {
-			"update_cache": true,
+			"var": "vars.cfg_authelia"
-			"pkg": [
-				"apt-transport-https",
-				"gpg"
-			]
 		}
 	},
 	{
-		"name": "packages | keys",
+		"name": "packages",
-		"become": true,
+		"block": [
-		"ansible.builtin.apt_key": {
+			{
-			"url": "https://apt.authelia.com/organization/signing.asc"
+				"name": "prerequisites",
-		}
+				"become": true,
-	},
+				"ansible.builtin.apt": {
-	{
+					"update_cache": true,
-		"name": "packages | repository",
+					"pkg": [
-		"become": true,
+						"apt-transport-https",
-		"ansible.builtin.apt_repository": {
+						"ca-certificates",
-			"repo": "deb https://apt.authelia.com/stable/debian/debian/ all main"
+						"gpg"
-		}
+					]
+				}
+			},
+			{
+				"name": "keys",
+				"become": true,
+				"ansible.builtin.get_url": {
+					"url": "https://www.authelia.com/keys/authelia-security.gpg",
+					"dest": "/usr/share/keyrings/authelia-security.gpg"
+				}
+			},
+			{
+				"name": "repository",
+				"become": true,
+				"ansible.builtin.shell": {
+					"cmd": "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/authelia-security.gpg] https://apt.authelia.com stable main\" > /etc/apt/sources.list.d/authelia.list",
+					"creates": "/etc/apt/sources.list.d/authelia.list"
+				}
 
-	},
+			},
-	{
+			{
-		"name": "packages | installation",
+				"name": "installation",
-		"become": true,
+				"become": true,
-		"ansible.builtin.apt": {
+				"ansible.builtin.apt": {
-			"update_cache": true,
+					"update_cache": true,
-			"pkg": [
+					"pkg": [
-				"openssl",
+						"openssl",
-				"python3-cryptography",
+						"python3-cryptography",
-				"python3-yaml",
+						"python3-yaml",
-				"authelia"
+						"authelia"
-			]
+					]
-		}
+				}
+			}
+		]
 	},
 	{
 		"name": "generate private key for signing OIDC JWTs",
@@ -50,74 +65,88 @@
 		"register": "temp_tls_result"
 	},
 	{
-		"name": "configuration | compose script",
+		"name": "configuration",
-		"become": true,
+		"block": [
-		"ansible.builtin.copy": {
+			{
-			"src": "conf-compose.py",
+				"name": "configuration | compose script",
-			"dest": "/usr/bin/authelia-conf-compose",
+				"become": true,
-			"mode": "0700"
+				"ansible.builtin.copy": {
-		}
+					"src": "conf-compose.py",
-	},
+					"dest": "/usr/bin/authelia-conf-compose",
-	{
+					"mode": "0700"
-		"name": "configuration | directories",
+				}
-		"become": true,
+			},
-		"loop": [
+			{
-			"/etc/authelia/conf.d",
+				"name": "configuration | directories",
-			"/etc/authelia/conf.d/clients"
+				"become": true,
-		],
+				"loop": [
-		"ansible.builtin.file": {
+					"/etc/authelia/conf.d",
-			"state": "directory",
+					"/etc/authelia/conf.d/clients"
-			"path": "{{item}}"
+				],
-		}
+				"ansible.builtin.file": {
-	},
+					"state": "directory",
-	{
+					"path": "{{item}}"
-		"name": "configuration | main",
+				}
-		"become": true,
+			},
-		"ansible.builtin.template": {
+			{
-			"src": "conf-main.json.j2",
+				"name": "configuration | main",
-			"dest": "/etc/authelia/conf.d/main.json"
+				"become": true,
-		}
+				"ansible.builtin.template": {
-	},
+					"src": "conf-main.json.j2",
-	{
+					"dest": "/etc/authelia/conf.d/main.json"
-		"name": "configuration | compose",
+				}
-		"become": true,
+			},
-		"ansible.builtin.command": {
+			{
-			"cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml"
+				"name": "configuration | compose",
-		}
+				"become": true,
+				"ansible.builtin.command": {
+					"cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml"
+				}
+			}
+		]
 	},
 	{
 		"name": "setup log directory",
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "directory",
-			"path": "{{var_authelia_log_file_path | dirname}}"
+			"owner": "authelia",
+			"group": "authelia",
+			"path": "{{cfg_authelia.log_file_path | dirname}}"
 		}
 	},
 	{
-		"name": "users | directory",
+		"name": "users",
-		"become": true,
+		"block": [
-		"ansible.builtin.file": {
+			{
-			"state": "directory",
+				"name": "directory",
-			"path": "{{var_authelia_users_file_path | dirname}}"
+				"become": true,
-		}
+				"ansible.builtin.file": {
-	},
+					"state": "directory",
-	{
+					"owner": "authelia",
-		"name": "users | initial file",
+					"group": "authelia",
-		"become": true,
+					"path": "{{cfg_authelia.users_file_path | dirname}}"
-		"ansible.builtin.template": {
+				}
-			"src": "users.yml.j2",
+			},
-			"dest": "{{var_authelia_users_file_path}}",
+			{
-			"force": false
+				"name": "initial file",
-		}
+				"become": true,
-	},
+				"ansible.builtin.template": {
-	{
+					"src": "users.yml.j2",
-		"name": "users | management script",
+					"dest": "{{cfg_authelia.users_file_path}}",
-		"become": true,
+					"force": false
-		"ansible.builtin.copy": {
+				}
-			"src": "user-manage.py",
+			},
-			"dest": "/usr/bin/authelia-user-manage",
+			{
-			"mode": "0700"
+				"name": "management script",
-		}
+				"become": true,
+				"ansible.builtin.copy": {
+					"src": "user-manage.py",
+					"dest": "/usr/bin/authelia-user-manage",
+					"mode": "0700"
+				}
+			}
+		]
 	},
 	{
 		"name": "apply",

roles/authelia/templates/conf-main.json.j2

@@ -2,12 +2,12 @@
 	"theme": "auto",
 	"identity_validation": {
 		"reset_password": {
-			"jwt_secret": "{{var_authelia_jwt_secret}}"
+			"jwt_secret": "{{cfg_authelia.jwt_secret}}"
 		}
 	},
 	"default_2fa_method": "totp",
 	"server": {
-		"address": "{{var_authelia_listen_address}}:9091",
+		"address": "{{cfg_authelia.listen_address}}:9091",
 		"endpoints": {
 			"enable_pprof": false,
 			"enable_expvars": false
@@ -17,7 +17,7 @@
 	"log": {
 		"level": "info",
 		"format": "json",
-		"file_path": "{{var_authelia_log_file_path}}",
+		"file_path": "{{cfg_authelia.log_file_path}}",
 		"keep_stdout": false
 	},
 	"telemetry": {
@@ -43,7 +43,7 @@
 		"user_verification": "preferred"
 	},
 	"ntp": {
-		"address": "{{var_authelia_ntp_server}}",
+		"address": "{{cfg_authelia.ntp_server}}",
 		"version": 4,
 		"max_desync": "3s",
 		"disable_startup_check": false,
@@ -51,16 +51,16 @@
 	},
 	"authentication_backend": {
 		"password_reset": {
-{% if var_authelia_password_reset_enabled %}
+{% if cfg_authelia.password_reset.enabled %}
 			"disable": false,
 {% else %}
 			"disable": true,
 {% endif %}
-			"custom_url": "{{var_authelia_password_reset_custom_url}}"
+			"custom_url": {{cfg_authelia.password_reset.custom_url | to_json}}
 		},
 		"refresh_interval": "5m",
 		"file": {
-			"path": "{{var_authelia_users_file_path}}",
+			"path": "{{cfg_authelia.users_file_path}}",
 			"watch": true,
 			"search": {
 				"email": false,
@@ -121,15 +121,15 @@
 	"session": {
 		"name": "authelia_session",
 		"same_site": "lax",
-		"secret": "{{var_authelia_session_secret}}",
+		"secret": "{{cfg_authelia.session_secret}}",
 		"expiration": "1h",
 		"inactivity": "5m",
 		"remember_me": "1M",
 		"cookies": [
 			{
-				"domain": "{{var_authelia_session_domain}}",
+				"domain": "{{cfg_authelia.session_domain}}",
-				"authelia_url": "https://{{var_authelia_domain}}/",
+				"authelia_url": "https://{{cfg_authelia.domain}}/",
-				"default_redirection_url": "{{var_authelia_redirect_url}}"
+				"default_redirection_url": "{{cfg_authelia.redirect_url}}"
 			}
 		]
 	},
@@ -139,45 +139,44 @@
 		"ban_time": "5m"
 	},
 	"storage": {
-		"encryption_key": "{{var_authelia_storage_encryption_key}}",
+		"encryption_key": "{{cfg_authelia.storage_encryption_key}}",
-{% if var_authelia_storage_kind == "sqlite" %}
+{% if cfg_authelia.storage.kind == "sqlite" %}
 		"local": {
-			"path": "{{var_authelia_storage_data_sqlite_path}}"
+			"path": "{{cfg_authelia.storage.data.path}}"
 		}
 {% endif %}
-{% if var_authelia_storage_kind == "postgresql" %}
+{% if cfg_authelia.storage.kind == "postgresql" %}
 		"postgres": {
-			"address": "{{var_authelia_storage_data_postgresql_host}}:{{var_authelia_storage_data_postgresql_port | string}}",
+			"address": "{{cfg_authelia.storage.data.host}}:{{cfg_authelia.storage.data.port | string}}",
 			"schema": "public",
-			"username": "{{var_authelia_storage_data_postgresql_username}}",
+			"username": "{{cfg_authelia.storage.data.username}}",
-			"password": "{{var_authelia_storage_data_postgresql_password}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
-			"database": "{{var_authelia_storage_data_postgresql_schema}}"
+			"database": "{{cfg_authelia.storage.data.schema}}"
 		}
 {% endif %}
-{% if var_authelia_storage_kind == "mariadb" %}
+{% if cfg_authelia.storage.kind == "mariadb" %}
 		"mysql": {
-			"host": "{{var_authelia_storage_data_mariadb_host}}",
+			"host": "{{cfg_authelia.storage.data.host}}",
-			"port": {{var_authelia_storage_data_mariadb_port | string}},
+			"port": {{cfg_authelia.storage.data.port | string}},
-			"username": "{{var_authelia_storage_data_mariadb_username}}",
+			"username": "{{cfg_authelia.storage.data.username}}",
-			"password": "{{var_authelia_storage_data_mariadb_password}}",
+			"password": "{{cfg_authelia.storage.data.password}}",
-			"database": "{{var_authelia_storage_data_mariadb_schema}}"
+			"database": "{{cfg_authelia.storage.data.schema}}"
 		}
 {% endif %}
 	},
 	"notifier": {
 		"disable_startup_check": true,
-{% if var_authelia_notification_mode == "file" %}
+{% if cfg_authelia.notification.kind == "file" %}
 		"filesystem": {
-			"filename": "{{var_authelia_notification_file_path}}"
+			"filename": "{{cfg_authelia.notification.data.path}}"
 		}
 {% endif %}
-{% if var_authelia_notification_mode == "smtp" %}
+{% if cfg_authelia.notification.kind == "smtp" %}
 		"smtp": {
-			"host": "{{var_authelia_notification_smtp_host}}",
+			"address": "{{cfg_authelia.notification.data.host}}:{{cfg_authelia.notification.data.port | string}}",
-			"port": {{var_authelia_notification_smtp_port | string}},
+			"username": "{{cfg_authelia.notification.data.username}}",
-			"username": "{{var_authelia_notification_smtp_username}}",
+			"password": "{{cfg_authelia.notification.data.password}}",
-			"password": "{{var_authelia_notification_smtp_password}}",
+			"sender": "{{cfg_authelia.notification.data.sender}}",
-			"sender": "{{var_authelia_notification_smtp_sender}}",
 			"disable_require_tls": false,
 			"disable_html_emails": false,
 			"tls": {
@@ -188,10 +187,24 @@
 	},
 	"identity_providers": {
 		"oidc": {
-			"hmac_secret": "{{var_authelia_oidc_hmac_secret}}",
+			"hmac_secret": "{{cfg_authelia.oidc.hmac_secret}}",
-			"issuer_private_key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}",
+			"jwks": [
+				{
+					"algorithm": "RS256",
+					"key": "{{temp_tls_result.privatekey | replace('\n', '\\n')}}"
+				}
+			],
+			"lifespans": {
+				"access_token": "{{cfg_authelia.oidc.lifespan.default.access_token}}",
+				"refresh_token": "{{cfg_authelia.oidc.lifespan.default.refresh_token}}",
+				"custom": {{cfg_authelia.oidc.lifespan.custom | to_json}}
+			},
 			"cors": {
 				"allowed_origins_from_client_redirect_uris": true
+{% if cfg_authelia.oidc.cors_endpoints == None %}
+{% else %}
+				,"endpoints": {{cfg_authelia.oidc.cors_endpoints | to_json}}
+{% endif %}
 			},
 			"clients": [
 			]

roles/authelia/vardef.json

@@ -1,143 +0,0 @@
-{
-	"version": {
-		"type": "string",
-		"mandatory": false
-	},
-	"architecture": {
-		"type": "string",
-		"mandatory": false
-	},
-	"listen_address": {
-		"type": "string",
-		"mandatory": false
-	},
-	"jwt_secret": {
-		"type": "string",
-		"mandatory": true
-	},
-	"users_file_path": {
-		"type": "string",
-		"mandatory": false
-	},
-	"log_file_path": {
-		"type": "string",
-		"mandatory": false
-	},
-	"domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"redirect_url": {
-		"type": "string",
-		"mandatory": false
-	},
-	"session_domain": {
-		"type": "string",
-		"mandatory": false
-	},
-	"session_secret": {
-		"type": "string",
-		"mandatory": true
-	},
-	"storage_encryption_key": {
-		"type": "string",
-		"mandatory": true
-	},
-	"storage_kind": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_sqlite_path": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_postgresql_host": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_postgresql_port": {
-		"type": "integer",
-		"mandatory": false
-	},
-	"storage_data_postgresql_username": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_postgresql_password": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_postgresql_schema": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_mariadb_host": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_mariadb_port": {
-		"type": "integer",
-		"mandatory": false
-	},
-	"storage_data_mariadb_username": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_mariadb_password": {
-		"type": "string",
-		"mandatory": false
-	},
-	"storage_data_mariadb_schema": {
-		"type": "string",
-		"mandatory": false
-	},
-	"ntp_server": {
-		"type": "string",
-		"mandatory": false
-	},
-	"password_reset_enabled": {
-		"type": "boolean",
-		"mandatory": false
-	},
-	"password_reset_custom_url": {
-		"nullable": true,
-		"type": "string",
-		"mandatory": false
-	},
-	"notification_mode": {
-		"type": "string",
-		"mandatory": false,
-		"options": [
-			"file",
-			"smtp"
-		]
-	},
-	"notification_file_path": {
-		"type": "string",
-		"mandatory": false
-	},
-	"notification_smtp_host": {
-		"type": "string",
-		"mandatory": false
-	},
-	"notification_smtp_port": {
-		"type": "integer",
-		"mandatory": false
-	},
-	"notification_smtp_username": {
-		"type": "string",
-		"mandatory": false
-	},
-	"notification_smtp_password": {
-		"type": "string",
-		"mandatory": false
-	},
-	"notification_smtp_sender": {
-		"type": "string",
-		"mandatory": false
-	},
-	"oidc_hmac_secret": {
-		"type": "string",
-		"mandatory": true
-	}
-}

roles/dokuwiki-and-nginx/defaults/main.json

@@ -1,5 +1,5 @@
 {
 	"var_dokuwiki_and_nginx_directory": "/opt/dokuwiki",
 	"var_dokuwiki_and_nginx_domain": "dokuwiki.example.org",
-	"var_dokuwiki_and_nginx_tls_enable": true
+	"var_dokuwiki_and_nginx_tls_mode": "force"
 }

roles/dokuwiki-and-nginx/templates/conf.j2

@@ -1,22 +1,4 @@
-server {
+{% macro dokuwiki_common() %}
-	listen 80;
-	listen [::]:80;
-	server_name {{var_dokuwiki_and_nginx_domain}};
-	return 301 https://$server_name$request_uri;
-}
- 
-server {
-	listen [::]:443 ssl;
-	listen 443 ssl;
-	
-	server_name {{var_dokuwiki_and_nginx_domain}};
-	
-{% if var_dokuwiki_and_nginx_tls_enable %}
-	ssl_certificate /etc/ssl/fullchains/{{var_dokuwiki_and_nginx_domain}}.pem;
-	ssl_certificate_key /etc/ssl/private/{{var_dokuwiki_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-{% endif %}
-	
 	# Maximum file upload size is 4MB - change accordingly if needed
 	client_max_body_size 4M;
 	client_body_buffer_size 128k;
@@ -58,4 +40,32 @@ server {
 		fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
 		# fastcgi_pass unix:/var/run/php5-fpm.sock; #old php version
 	}
+{% endmacro %}
+
+server {
+	server_name {{var_dokuwiki_and_nginx_domain}};
+	
+	listen 80;
+	listen [::]:80;
+	
+{% if (var_dokuwiki_and_nginx_tls_mode == 'force') %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ dokuwiki_common() }}
+{% endif %}
 }
+
+{% if (var_dokuwiki_and_nginx_tls_mode != 'disable') %}
+server {
+	server_name {{var_dokuwiki_and_nginx_domain}};
+	
+	listen [::]:443 ssl http2;
+	listen 443 ssl http2;
+	
+	ssl_certificate_key /etc/ssl/private/{{var_dokuwiki_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_dokuwiki_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ dokuwiki_common() }}
+}
+{% endif %}

roles/dokuwiki-and-nginx/vardef.json

@@ -0,0 +1,19 @@
+{
+	"directory": {
+		"type": "string",
+		"mandatory": false
+	},
+	"domain": {
+		"type": "string",
+		"mandatory": false
+	},
+	"tls_mode": {
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		],
+		"mandatory": false
+	}
+}

roles/element-and-nginx/defaults/main.json

@@ -1,4 +1,5 @@
 {
 	"var_element_and_nginx_domain": "element.example.org",
-	"var_element_and_nginx_path": "/opt/element"
+	"var_element_and_nginx_path": "/opt/element",
+	"var_element_and_nginx_tls_mode": "force"
 }

roles/element-and-nginx/templates/conf.j2

@@ -1,14 +1,31 @@
+{% macro element_common() %}
+root {{var_element_and_nginx_path}};
+{% endmacro %}
+
 server {
+	server_name {{var_element_and_nginx_domain}};
+	
 	listen 80;
 	listen [::]:80;
+
+{% if (var_element_and_nginx_tls_mode == 'force') %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ element_common() }}
+{% endif %}
+}
+
+{% if (var_element_and_nginx_tls_mode != 'disable') %}
+server {
+	server_name {{var_element_and_nginx_domain}};
+	
 	listen 443 ssl;
 	listen [::]:443 ssl;
 	
-	server_name {{var_element_and_nginx_domain}};
-	
-	ssl_certificate /etc/ssl/fullchains/{{var_element_and_nginx_domain}}.pem;
 	ssl_certificate_key /etc/ssl/private/{{var_element_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_element_and_nginx_domain}}.pem;
 	include /etc/nginx/ssl-hardening.conf;
 	
-	root {{var_element_and_nginx_path}};
+{{ element_common() }}
 }
+{% endif %}

roles/element-and-nginx/vardef.json

@@ -0,0 +1,19 @@
+{
+	"domain": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"path": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"tls_mode": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		]
+	}
+}

roles/forgejo-and-nginx/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_forgejo_and_nginx_domain": "forgejo.example.org",
+	"var_forgejo_and_nginx_port": 2378,
+	"var_forgejo_and_nginx_tls_mode": "force"
+}

roles/forgejo-and-nginx/info.md

@@ -0,0 +1 @@
+

roles/forgejo-and-nginx/tasks/main.json

@@ -0,0 +1,35 @@
+[
+	{
+		"name": "deactivate default site",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "absent",
+			"dest": "/etc/nginx/sites-enabled/default"
+		}
+	},
+	{
+		"name": "emplace configuration | data",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "conf.j2",
+			"dest": "/etc/nginx/sites-available/{{var_forgejo_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "emplace configuration | link",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "link",
+			"src": "/etc/nginx/sites-available/{{var_forgejo_and_nginx_domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{var_forgejo_and_nginx_domain}}"
+		}
+	},
+	{
+		"name": "restart nginx",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "nginx"
+		}
+	}
+]

roles/forgejo-and-nginx/templates/conf.j2

@@ -0,0 +1,34 @@
+{% macro forgejo_common() %}
+	location / {
+		proxy_pass http://localhost:{{var_forgejo_and_nginx_port | string}};
+		client_max_body_size 20M;
+	}
+{% endmacro %}
+
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name {{var_forgejo_and_nginx_domain}};
+	
+{% if var_forgejo_and_nginx_tls_mode == 'force' %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ forgejo_common() }}
+{% endif %}
+}
+
+{% if var_forgejo_and_nginx_tls_mode != 'disable' %}
+server {
+	listen 443 ssl;
+	listen [::]:443 ssl;
+	
+	server_name {{var_forgejo_and_nginx_domain}};
+	
+	ssl_certificate_key /etc/ssl/private/{{var_forgejo_and_nginx_domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{var_forgejo_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ forgejo_common() }}
+}
+{% endif %}

roles/forgejo-and-nginx/vardef.json

@@ -0,0 +1,19 @@
+{
+	"domain": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"port": {
+		"mandatory": false,
+		"type": "integer"
+	},
+	"tls_mode": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		]
+	}
+}

roles/forgejo/defaults/main.json

@@ -0,0 +1,31 @@
+{
+	"var_forgejo_user": "forgejo",
+	"var_forgejo_directory_main": "/opt/forgejo",
+	"var_forgejo_directory_repositories": "/var/forgejo/repositories",
+	"var_forgejo_version": "10.0.3",
+	"var_forgejo_platform": "linux-amd64",
+	"var_forgejo_secret_key": "REPLACE_ME",
+	"var_forgejo_internal_token": "REPLACE_ME",
+	"var_forgejo_domain": "forgejo.example.org",
+	"var_forgejo_listen_address": "0.0.0.0",
+	"var_forgejo_listen_port": 2378,
+	"var_forgejo_database_kind": "sqlite",
+	"var_forgejo_database_data_sqlite_path": "/var/forgejo/data.sqlite",
+	"var_forgejo_database_data_postgresql_host": "postgresql.example.org",
+	"var_forgejo_database_data_postgresql_port": 5432,
+	"var_forgejo_database_data_postgresql_username": "forgejo_user",
+	"var_forgejo_database_data_postgresql_password": "REPLACE_ME",
+	"var_forgejo_database_data_postgresql_scheme": "forgejo",
+	"var_forgejo_authentication_kind": "internal",
+	"var_forgejo_authentication_data_authelia_url_base": "https://authelia.example.org",
+	"var_forgejo_authentication_data_authelia_client_id": "forgejo",
+	"var_forgejo_authentication_data_authelia_client_secret": "REPLACE_ME",
+	"var_forgejo_smtp_host": "smtp.example.org",
+	"var_forgejo_smtp_port": 465,
+	"var_forgejo_smtp_username": "REPLACE_ME",
+	"var_forgejo_smtp_password": "REPLACE_ME",
+	"var_forgejo_email_sending_enabled": false,
+	"var_forgejo_email_sending_sender": "forgejo@example.org",
+	"var_forgejo_email_sending_html": false,
+	"var_forgejo_title": "Forgejo: Beyond coding. We Forge."
+}

roles/forgejo/info.md

@@ -0,0 +1,14 @@
+## Beschreibung
+
+Zur Einrichtung der DevOps-Platform [Forgejo](https://forgejo.org/)
+
+
+## Verweise
+
+- [Forgejo | Documentation | Administrator Guide](https://forgejo.org/docs/latest/admin/)
+- [Forgejo | Documentation | Configuration Cheat Sheet](https://forgejo.org/docs/latest/admin/config-cheat-sheet/)
+
+
+## ToDo
+
+- Download verfizieren

roles/forgejo/tasks/main.json

@@ -0,0 +1,101 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"git"
+			]
+		}
+	},
+	{
+		"name": "user",
+		"become": true,
+		"ansible.builtin.user": {
+			"name": "{{var_forgejo_user}}",
+			"create_home": true,
+			"home": "{{var_forgejo_directory_main}}"
+		}
+	},
+	{
+		"name": "directories | external",
+		"become": true,
+		"loop": [
+			"{{var_forgejo_database_data_sqlite_path | dirname}}",
+			"{{var_forgejo_directory_repositories}}"
+		],
+		"ansible.builtin.file": {
+			"path": "{{item}}",
+			"state": "directory",
+			"owner": "{{var_forgejo_user}}"
+		}
+	},
+	{
+		"name": "directories | internal",
+		"become": true,
+		"become_user": "{{var_forgejo_user}}",
+		"loop": [
+			"{{var_forgejo_directory_main}}/custom/conf"
+		],
+		"ansible.builtin.file": {
+			"path": "{{item}}",
+			"state": "directory"
+		}
+	},
+	{
+		"name": "download",
+		"become": true,
+		"become_user": "{{var_forgejo_user}}",
+		"ansible.builtin.get_url": {
+			"url": "https://codeberg.org/forgejo/forgejo/releases/download/v{{var_forgejo_version}}/forgejo-{{var_forgejo_version}}-{{var_forgejo_platform}}",
+			"dest": "{{var_forgejo_directory_main}}/forgejo",
+			"mode": "u+rx"
+		}
+	},
+	{
+		"name": "config | base",
+		"become": true,
+		"become_user": "{{var_forgejo_user}}",
+		"ansible.builtin.template": {
+			"src": "config.ini.j2",
+			"dest": "{{var_forgejo_directory_main}}/custom/conf/app.ini"
+		}
+	},
+	{
+		"name": "config | database",
+		"become": true,
+		"become_user": "{{var_forgejo_user}}",
+		"ansible.builtin.command": {
+			"chdir": "{{var_forgejo_directory_main}}",
+			"cmd": "./forgejo migrate"
+		}
+	},
+	{
+		"name": "config | authelia",
+		"when": "var_forgejo_authentication_kind == 'authelia'",
+		"become": true,
+		"become_user": "{{var_forgejo_user}}",
+		"ansible.builtin.shell": {
+			"chdir": "{{var_forgejo_directory_main}}",
+			"cmd": "(./forgejo admin auth list | grep authelia) || ./forgejo admin auth add-oauth --provider='openidConnect' --name='authelia' --key={{var_forgejo_authentication_data_authelia_client_id}} --secret={{var_forgejo_authentication_data_authelia_client_secret}} --auto-discover-url='{{var_forgejo_authentication_data_authelia_url_base}}/.well-known/openid-configuration' --scopes='openid email profile'"
+		}
+	},
+	{
+		"name": "systemd unit",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "systemd-unit.j2",
+			"dest": "/etc/systemd/system/forgejo.service"
+		}
+	},
+	{
+		"name": "start",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"enabled": true,
+			"state": "restarted",
+			"name": "forgejo"
+		}
+	}
+]

roles/forgejo/templates/config.ini.j2

@@ -0,0 +1,123 @@
+APP_NAME = {{var_forgejo_title}}
+RUN_USER = {{var_forgejo_user}}
+RUN_MODE = prod
+
+[server]
+DOMAIN = {{var_forgejo_domain}}
+ROOT_URL = https://{{var_forgejo_domain}}
+;HTTP_ADDR = {{var_forgejo_listen_address}}
+HTTP_PORT = {{var_forgejo_listen_port | string}}
+;LANDING_PAGE = home
+
+[database]
+{% if var_forgejo_database_kind == 'sqlite' %}
+DB_TYPE = sqlite3
+PATH = {{var_forgejo_database_data_sqlite_path}}
+{% endif %}
+{% if var_forgejo_database_kind == 'postgresql' %}
+DB_TYPE = postgres
+HOST = {{var_forgejo_database_data_postgresql_host}}:{{var_forgejo_database_data_postgresql_port | string}}
+USER = {{var_forgejo_database_data_postgresql_username}}
+PASSWD = {{var_forgejo_database_data_postgresql_password}}
+NAME = {{var_forgejo_database_data_postgresql_scheme}}
+{% endif %}
+
+[security]
+INSTALL_LOCK = true
+SECRET_KEY = {{var_forgejo_secret_key}}
+INTERNAL_TOKEN = {{var_forgejo_internal_token}}
+DISABLE_GIT_HOOKS = true
+
+[oauth2]
+ENABLED = false
+
+[log]
+MODE = console
+LEVEL = Info
+
+[git]
+HOME_PATH = {{var_forgejo_directory_main}}
+
+[service]
+REGISTER_EMAIL_CONFIRM = false
+
+{% if var_forgejo_authentication_kind == 'internal' %}
+DISABLE_REGISTRATION = false
+ALLOW_ONLY_INTERNAL_REGISTRATION = true
+ALLOW_ONLY_EXTERNAL_REGISTRATION = false
+SHOW_REGISTRATION_BUTTON = true
+{% else %}
+DISABLE_REGISTRATION = false
+ALLOW_ONLY_INTERNAL_REGISTRATION = false
+ALLOW_ONLY_EXTERNAL_REGISTRATION = true
+SHOW_REGISTRATION_BUTTON = false
+{% endif %}
+
+;REQUIRE_SIGNIN_VIEW = false
+ENABLE_NOTIFY_MAIL = true
+
+;ENABLE_BASIC_AUTHENTICATION = true
+;ENABLE_REVERSE_PROXY_AUTHENTICATION = false
+;ENABLE_REVERSE_PROXY_AUTHENTICATION_API = false
+;ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
+;ENABLE_REVERSE_PROXY_EMAIL = false
+;ENABLE_REVERSE_PROXY_FULL_NAME = false
+
+;DEFAULT_KEEP_EMAIL_PRIVATE = false
+;DEFAULT_ALLOW_CREATE_ORGANIZATION = true
+;DEFAULT_USER_IS_RESTRICTED = false
+;DEFAULT_USER_VISIBILITY = public
+;ALLOWED_USER_VISIBILITY_MODES = public,limited,private
+;DEFAULT_ORG_VISIBILITY = public
+;DEFAULT_ORG_MEMBER_VISIBLE = false
+;DEFAULT_ENABLE_DEPENDENCIES = true
+;ALLOW_CROSS_REPOSITORY_DEPENDENCIES = true
+ENABLE_USER_HEATMAP = false
+ENABLE_TIMETRACKING = false
+DEFAULT_ENABLE_TIMETRACKING = false
+
+{% if var_forgejo_authentication_kind == 'internal' %}
+SHOW_REGISTRATION_BUTTON = true
+{% else %}
+SHOW_REGISTRATION_BUTTON = false
+{% endif %}
+
+AUTO_WATCH_NEW_REPOS = false
+AUTO_WATCH_ON_CHANGES = false
+
+[repository]
+ROOT = {{var_forgejo_directory_repositories}}
+
+{% if var_forgejo_authentication_kind == 'internal' %}
+[openid]
+ENABLE_OPENID_SIGNIN = false
+ENABLE_OPENID_SIGNUP = false
+{% else %}
+[openid]
+ENABLE_OPENID_SIGNIN = false
+ENABLE_OPENID_SIGNUP = true
+WHITELISTED_URIS = {{var_forgejo_authentication_data_authelia_url_base}}
+
+[oauth2_client]
+REGISTER_EMAIL_CONFIRM = false
+OPENID_CONNECT_SCOPES = openid email profile
+ENABLE_AUTO_REGISTRATION = true
+USERNAME = nickname
+{% endif %}
+
+[mailer]
+{% if var_forgejo_email_sending_enabled %}
+ENABLED = true
+SMTP_ADDR = {{var_forgejo_smtp_host}}
+SMTP_PORT = {{var_forgejo_smtp_port | string}}
+FROM = {{var_forgejo_email_sending_sender}}
+USER = {{var_forgejo_smtp_username}}
+PASSWD = {{var_forgejo_smtp_password}}
+{% if var_forgejo_email_sending_html %}
+SEND_AS_PLAIN_TEXT = false
+{% else %}
+SEND_AS_PLAIN_TEXT = true
+{% endif %}
+{% else %}
+ENABLED = false
+{% endif %}

roles/forgejo/templates/systemd-unit.j2

@@ -0,0 +1,21 @@
+[Unit]
+Description=Forgejo
+After=network.target
+{% if var_forgejo_database_kind == 'postgresql' %}
+Wants=postgresql.service
+After=postgresql.service
+{% endif %}
+
+[Service]
+RestartSec=2s
+Type=simple
+User={{var_forgejo_user}}
+Group={{var_forgejo_user}}
+WorkingDirectory={{var_forgejo_directory_main}}
+ExecStart={{var_forgejo_directory_main}}/forgejo web --config {{var_forgejo_directory_main}}/custom/conf/app.ini
+Restart=always
+# Environment=USER=git HOME=/home/git FORGEJO_WORK_DIR=/var/lib/forgejo
+# Environment=PATH=/path/to/git/bin:/bin:/sbin:/usr/bin:/usr/sbin
+
+[Install]
+WantedBy=multi-user.target

roles/forgejo/vardef.json

@@ -0,0 +1,126 @@
+{
+	"user": {
+		"type": "string",
+		"mandatory": false
+	},
+	"directory_main": {
+		"type": "string",
+		"mandatory": false
+	},
+	"directory_repositories": {
+		"type": "string",
+		"mandatory": false
+	},
+	"version": {
+		"type": "string",
+		"mandatory": false
+	},
+	"platform": {
+		"type": "string",
+		"mandatory": false
+	},
+	"secret_key": {
+		"type": "string",
+		"mandatory": true
+	},
+	"internal_token": {
+		"type": "string",
+		"mandatory": true
+	},
+	"domain": {
+		"type": "string",
+		"mandatory": false
+	},
+	"listen_address": {
+		"type": "string",
+		"mandatory": false
+	},
+	"listen_port": {
+		"type": "integer",
+		"mandatory": false
+	},
+	"database_kind": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"sqlite",
+			"postgresql"
+		]
+	},
+	"database_data_sqlite_path": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"database_data_postgresql_host": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"database_data_postgresql_port": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"database_data_postgresql_username": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"database_data_postgresql_password": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"database_data_postgresql_schema": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"authentication_kind": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"internal",
+			"authelia"
+		]
+	},
+	"authentication_data_authelia_url_base": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"authentication_data_authelia_client_id": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"authentication_data_authelia_client_secret": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"smtp_host": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"smtp_port": {
+		"mandatory": false,
+		"type": "integer"
+	},
+	"smtp_username": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"smtp_password": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"email_sending_enabled": {
+		"mandatory": false,
+		"type": "boolean"
+	},
+	"email_sending_sender": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"email_sending_html": {
+		"mandatory": false,
+		"type": "boolean"
+	},
+	"title": {
+		"mandatory": false,
+		"type": "string"
+	}
+}

roles/gitlab-and-nginx/defaults/main.json

@@ -1,4 +1,5 @@
 {
 	"var_gitlab_and_nginx_domain": "element.example.org",
-	"var_gitlab_and_nginx_path": "/opt/element"
+	"var_gitlab_and_nginx_path": "/opt/element",
+	"var_gitlab_and_nginx_tls_mode": "force"
 }

roles/gitlab-and-nginx/templates/conf.j2

@@ -1,64 +1,7 @@
-upstream gitlab-workhorse {
+{% macro gitlab_common() %}
-	server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-}
-
-map $http_upgrade $connection_upgrade_gitlab_ssl {
-	default upgrade;
-	'' close;
-}
-
-log_format gitlab_ssl_access '$remote_addr - $remote_user [$time_local] "$request_method $gitlab_ssl_filtered_request_uri $server_protocol" $status $body_bytes_sent "$gitlab_ssl_filtered_http_referer" "$http_user_agent"';
-
-map $request_uri $gitlab_ssl_temp_request_uri_1 {
-	default $request_uri;
-	~(?i)^(?<start>.*)(?<temp>[\?&]private[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
-}
-
-map $gitlab_ssl_temp_request_uri_1 $gitlab_ssl_temp_request_uri_2 {
-	default $gitlab_ssl_temp_request_uri_1;
-	~(?i)^(?<start>.*)(?<temp>[\?&]authenticity[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
-}
-
-map $gitlab_ssl_temp_request_uri_2 $gitlab_ssl_filtered_request_uri {
-	default $gitlab_ssl_temp_request_uri_2;
-	~(?i)^(?<start>.*)(?<temp>[\?&]feed[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
-}
-
-map $http_referer $gitlab_ssl_filtered_http_referer {
-	default $http_referer;
-	~^(?<temp>.*)\? $temp;
-}
-
-server {
-	listen 80 default_server;
-	listen [::]:80 ipv6only=on default_server;
-	
-	server_name {{var_gitlab_and_nginx_domain}};
-	server_tokens off;
-	
-	return 301 https://$http_host$request_uri;
-	
-	access_log /var/log/nginx/gitlab_access.log gitlab_ssl_access;
-	error_log /var/log/nginx/gitlab_error.log;
-}
-
-server {
-	listen 0.0.0.0:443 ssl http2;
-	listen [::]:443 ipv6only=on ssl http2 default_server;
-	
-	server_name {{var_gitlab_and_nginx_domain}};
-	server_tokens off;
-	
-	ssl_certificate /etc/ssl/fullchains/{{var_gitlab_and_nginx_domain}}.pem;
-	ssl_certificate_key /etc/ssl/private/{{var_gitlab_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-	
 	real_ip_header X-Real-IP;
 	real_ip_recursive off;
 	
-	access_log /var/log/nginx/gitlab_access.log gitlab_ssl_access;
-	error_log /var/log/nginx/gitlab_error.log;
-	
 	location / {
 		client_max_body_size 0;
 		gzip off;
@@ -90,5 +33,71 @@ server {
 		root /home/git/gitlab/public;
 		internal;
 	}
+{% endmacro %}
+
+upstream gitlab-workhorse {
+	server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 }
 
+map $http_upgrade $connection_upgrade_gitlab_ssl {
+	default upgrade;
+	'' close;
+}
+
+log_format gitlab_ssl_access '$remote_addr - $remote_user [$time_local] "$request_method $gitlab_ssl_filtered_request_uri $server_protocol" $status $body_bytes_sent "$gitlab_ssl_filtered_http_referer" "$http_user_agent"';
+
+map $request_uri $gitlab_ssl_temp_request_uri_1 {
+	default $request_uri;
+	~(?i)^(?<start>.*)(?<temp>[\?&]private[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
+}
+
+map $gitlab_ssl_temp_request_uri_1 $gitlab_ssl_temp_request_uri_2 {
+	default $gitlab_ssl_temp_request_uri_1;
+	~(?i)^(?<start>.*)(?<temp>[\?&]authenticity[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
+}
+
+map $gitlab_ssl_temp_request_uri_2 $gitlab_ssl_filtered_request_uri {
+	default $gitlab_ssl_temp_request_uri_2;
+	~(?i)^(?<start>.*)(?<temp>[\?&]feed[\-_]token)=[^&]*(?<rest>.*)$ "$start$temp=[FILTERED]$rest";
+}
+
+map $http_referer $gitlab_ssl_filtered_http_referer {
+	default $http_referer;
+	~^(?<temp>.*)\? $temp;
+}
+
+server {
+	server_name {{var_gitlab_and_nginx_domain}};
+	server_tokens off;
+	
+	listen 80;
+	listen [::]:80 ipv6only=on;
+	
+{% if (var_gitlab_and_nginx_tls_mode == 'force') %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+	access_log /var/log/nginx/gitlab_access.log;
+	error_log /var/log/nginx/gitlab_error.log;
+	
+{{ gitlab_common() }}
+{% endif %}
+}
+
+{% if (var_gitlab_and_nginx_tls_mode != 'disable') %}
+server {
+	server_name {{var_gitlab_and_nginx_domain}};
+	server_tokens off;
+	
+	listen 443 ssl http2;
+	listen [::]:443 ipv6only=on ssl http2;
+	
+	ssl_certificate /etc/ssl/fullchains/{{var_gitlab_and_nginx_domain}}.pem;
+	ssl_certificate_key /etc/ssl/private/{{var_gitlab_and_nginx_domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+	access_log /var/log/nginx/gitlab_access.log gitlab_ssl_access;
+	error_log /var/log/nginx/gitlab_error.log;
+	
+{{ gitlab_common() }}
+}
+{% endif %}

roles/gitlab-and-nginx/vardef.json

@@ -0,0 +1,19 @@
+{
+	"domain": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"path": {
+		"mandatory": false,
+		"type": "string"
+	},
+	"tls_mode": {
+		"mandatory": false,
+		"type": "string",
+		"options": [
+			"disable",
+			"enable",
+			"force"
+		]
+	}
+}

roles/hedgedoc-and-lighttpd/templates/conf.j2

@@ -23,7 +23,7 @@ $HTTP["host"] == "{{var_hedgedoc_and_lighttpd_domain}}" {
 	$SERVER["socket"] == ":443" {
 		## mit dem SSL-Kram beglücken
 		ssl.engine  = "enable"
-		ssl.pemfile = "/etc/ssl/certs/{{var_hedgedoc_and_lighttpd_domain}}.pem"
+		ssl.pemfile = "/etc/ssl/fullchains/{{var_hedgedoc_and_lighttpd_domain}}.pem"
 		ssl.privkey = "/etc/ssl/keys/{{var_hedgedoc_and_lighttpd_domain}}.pem"
 		ssl.ca-file = "/etc/ssl/fullchains/{{var_hedgedoc_and_lighttpd_domain}}.pem"
 		ssl.use-sslv2 = "disable"

roles/hedgedoc-and-nginx/cfg.schema.json

@@ -0,0 +1,24 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"tls_mode": {
+			"nullable": false,
+			"type": "string",
+			"options": [
+				"disable",
+				"enable",
+				"force"
+			],
+			"default": "force"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"domain"
+	]
+}

roles/hedgedoc-and-nginx/defaults/main.json

@@ -1,3 +1,5 @@
 {
-	"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org"
+	"cfg_hedgedoc_and_nginx_defaults": {
+		"tls_mode": "force"
+	}
 }

roles/hedgedoc-and-nginx/tasks/main.json

@@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_hedgedoc_and_nginx"
+		}
+	},
 	{
 		"name": "deactivate default site",
 		"become": true,
@@ -12,7 +19,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "conf.j2",
-			"dest": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}"
 		}
 	},
 	{
@@ -20,8 +27,8 @@
 		"become": true,
 		"ansible.builtin.file": {
 			"state": "link",
-			"src": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}",
+			"src": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}",
-			"dest": "/etc/nginx/sites-enabled/{{var_hedgedoc_and_nginx_domain}}"
+			"dest": "/etc/nginx/sites-enabled/{{cfg_hedgedoc_and_nginx.domain}}"
 		}
 	},
 	{

roles/hedgedoc-and-nginx/templates/conf.j2

@@ -3,16 +3,7 @@ map $http_upgrade $connection_upgrade {
 	'' close;
 }
 
-server {
+{% macro hedgedoc_common() %}
-	server_name {{var_hedgedoc_and_nginx_domain}};
-	
-	listen [::]:443 ssl http2;
-	listen 443 ssl http2;
-	
-	ssl_certificate /etc/ssl/certs/{{var_hedgedoc_and_nginx_domain}}.pem;
-	ssl_certificate_key /etc/ssl/private/{{var_hedgedoc_and_nginx_domain}}.pem;
-	include /etc/nginx/ssl-hardening.conf;
-	
 	location / {
 		proxy_pass http://localhost:3000;
 		proxy_set_header Host $host;
@@ -30,4 +21,32 @@ server {
 		proxy_set_header Upgrade $http_upgrade;
 		proxy_set_header Connection $connection_upgrade;
 	}
+{% endmacro %}
+
+server {
+	server_name {{cfg_hedgedoc_and_nginx.domain}};
+	
+	listen 80;
+	listen [::]:80;
+	
+{% if (cfg_hedgedoc_and_nginx.tls_mode == 'force') %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+{{ hedgedoc_common() }}
+{% endif %}
 }
+
+{% if (cfg_hedgedoc_and_nginx.tls_mode != 'disable') %}
+server {
+	server_name {{cfg_hedgedoc_and_nginx.domain}};
+	
+	listen [::]:443 ssl http2;
+	listen 443 ssl http2;
+	
+	ssl_certificate_key /etc/ssl/private/{{cfg_hedgedoc_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_hedgedoc_and_nginx.domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+{{ hedgedoc_common() }}
+}
+{% endif %}

roles/hedgedoc/cfg.schema.json

@@ -0,0 +1,248 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"user_name": {
+			"nullable": false,
+			"type": "string",
+			"default": "hedgedoc"
+		},
+		"directory": {
+			"nullable": false,
+			"type": "string",
+			"default": "/opt/hedgedoc"
+		},
+		"version": {
+			"nullable": false,
+			"type": "string",
+			"default": "1.10.3"
+		},
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"session_secret": {
+			"nullable": false,
+			"type": "string"
+		},
+		"database": {
+			"anyOf": [
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["sqlite"],
+							"default": "sqlite"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"path": {
+									"nullable": false,
+									"type": "string",
+									"default": "/var/hedgedoc/data.sqlite"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"path"
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["postgresql"],
+							"default": "postgresql"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"host": {
+									"nullable": false,
+									"type": "string",
+									"default": "localhost"
+								},
+								"port": {
+									"nullable": false,
+									"type": "integer",
+									"default": 5432
+								},
+								"username": {
+									"nullable": false,
+									"type": "string",
+									"default": "hedgedoc_user"
+								},
+								"password": {
+									"nullable": false,
+									"type": "string"
+								},
+								"schema": {
+									"nullable": false,
+									"type": "string",
+									"default": "hedgedoc"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"host",
+								"port",
+								"username",
+								"password",
+								"schema"
+							]
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				}
+			]
+		},
+		"authentication": {
+			"anyOf": [
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["internal"],
+							"default": "internal"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+							},
+							"additionalProperties": false,
+							"required": [
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"nullable": false,
+							"type": "string",
+							"enum": ["authelia"],
+							"default": "authelia"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"url_base": {
+									"nullable": false,
+									"type": "string"
+								},
+								"client_id": {
+									"nullable": false,
+									"type": "string",
+									"default": "hedgedoc"
+								},
+								"client_secret": {
+									"nullable": false,
+									"type": "string"
+								},
+								"provider_name": {
+									"nullable": false,
+									"type": "string",
+									"default": "Authelia"
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"url_base",
+								"client_id",
+								"client_secret",
+								"provider_name"
+							]	
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				}
+			]
+		},
+		"guest_allow_create": {
+			"nullable": false,
+			"type": "boolean",
+			"default": false
+		},
+		"guest_allow_change": {
+			"nullable": false,
+			"type": "boolean",
+			"default": false
+		},
+		"free_names_mode": {
+			"nullable": false,
+			"type": "string",
+			"enum": [
+				"never",
+				"authed",
+				"always"
+			],
+			"default": "authed"
+		},
+		"log_level": {
+			"nullable": false,
+			"type": "string",
+			"enum": [
+				"debug",
+				"verbose",
+				"info",
+				"warn",
+				"error"
+			],
+			"default": "error"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"user_name",
+		"directory",
+		"version",
+		"domain",
+		"session_secret",
+		"database",
+		"authentication",
+		"guest_allow_create",
+		"guest_allow_change",
+		"free_names_mode",
+		"log_level"
+	]
+}

roles/hedgedoc/defaults/main.json

@@ -1,21 +1,22 @@
 {
-	"var_hedgedoc_user_name": "hedgedoc",
+	"cfg_hedgedoc_defaults": {
-	"var_hedgedoc_directory": "/opt/hedgedoc",
+		"user_name": "hedgedoc",
-	"var_hedgedoc_version": "1.9.9",
+		"directory": "/opt/hedgedoc",
-	"var_hedgedoc_session_secret": "REPLACE_ME",
+		"version": "1.10.3",
-	"var_hedgedoc_database_kind": "sqlite",
+		"database": {
-	"var_hedgedoc_database_data_sqlite_path": "/var/hedgedoc/data.sqlite",
+			"kind": "sqlite",
-	"var_hedgedoc_database_data_postgresql_host": "localhost",
+			"data": {
-	"var_hedgedoc_database_data_postgresql_port": 5432,
+				"path": "/var/hedgedoc/data.sqlite"
-	"var_hedgedoc_database_data_postgresql_username": "hedgedoc_user",
+			}
-	"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME",
+		},
-	"var_hedgedoc_database_data_postgresql_schema": "hedgedoc",
+		"authentication": {
-	"var_hedgedoc_domain": "hedgedoc.example.org",
+			"kind": "internal",
-	"var_hedgedoc_authentication_kind": "authelia",
+			"data": {
-	"var_hedgedoc_authentication_data_authelia_client_id": "hedgedoc",
+			}
-	"var_hedgedoc_authentication_data_authelia_client_secret": "REPLACE_ME",
+		},
-	"var_hedgedoc_authentication_data_authelia_url_base": "https://authelia.linke.sx",
+		"guest_allow_create": false,
-	"var_hedgedoc_guest_allow_create": false,
+		"guest_allow_change": false,
-	"var_hedgedoc_guest_allow_change": false,
+		"free_names_mode": "authed",
-	"var_hedgedoc_free_names_mode": "authed"
+		"log_level": "error"
+	}
 }

roles/hedgedoc/tasks/main.json

@@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_hedgedoc"
+		}
+	},
 	{
 		"name": "packages",
 		"become": true,
@@ -26,15 +33,41 @@
 		"name": "user",
 		"become": true,
 		"ansible.builtin.user": {
-			"name": "{{var_hedgedoc_user_name}}",
+			"name": "{{cfg_hedgedoc.user_name}}",
-			"create_home": true
+			"create_home": true,
+			"home": "{{cfg_hedgedoc.directory}}"
 		}
 	},
+	{
+		"name": "database",
+		"when": "cfg_hedgedoc.database.kind == 'sqlite'",
+		"block": [
+			{
+				"name": "database | directory",
+				"become": true,
+				"ansible.builtin.file": {
+					"state": "directory",
+					"path": "{{cfg_hedgedoc.database.data.sqlite.path | dirname}}",
+					"owner": "{{cfg_hedgedoc.user_name}}"
+				}
+			},
+			{
+				"name": "database | file",
+				"become": true,
+				"ansible.builtin.file": {
+					"state": "touch",
+					"path": "{{cfg_hedgedoc.database.data.sqlite.path}}",
+					"owner": "{{cfg_hedgedoc.user_name}}"
+				}
+			}
+		]
+
+	},
 	{
 		"name": "download",
 		"become": false,
 		"ansible.builtin.get_url": {
-			"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{var_hedgedoc_version}}/hedgedoc-{{var_hedgedoc_version}}.tar.gz",
+			"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{cfg_hedgedoc.version}}/hedgedoc-{{cfg_hedgedoc.version}}.tar.gz",
 			"dest": "/tmp/hedgedoc.tar.gz"
 		}
 	},
@@ -44,8 +77,8 @@
 		"ansible.builtin.unarchive": {
 			"remote_src": true,
 			"src": "/tmp/hedgedoc.tar.gz",
-			"dest": "{{var_hedgedoc_directory | dirname}}",
+			"dest": "{{cfg_hedgedoc.directory | dirname}}",
-			"owner": "{{var_hedgedoc_user_name}}"
+			"owner": "{{cfg_hedgedoc.user_name}}"
 		}
 	},
 	{
@@ -53,7 +86,7 @@
 		"become": true,
 		"become_user": "hedgedoc",
 		"ansible.builtin.command": {
-			"chdir": "{{var_hedgedoc_directory}}",
+			"chdir": "{{cfg_hedgedoc.directory}}",
 			"cmd": "bin/setup"
 		}
 	},
@@ -62,7 +95,7 @@
 		"become": true,
 		"ansible.builtin.template": {
 			"src": "config.json.j2",
-			"dest": "{{var_hedgedoc_directory}}/config.json"
+			"dest": "{{cfg_hedgedoc.directory}}/config.json"
 		}
 	},
 	{

roles/hedgedoc/templates/config.json.j2

@@ -1,61 +1,61 @@
 {
 	"production": {
-		"loglevel": "error",
+		"loglevel": "{{cfg_hedgedoc.log_level}}",
-{% if var_hedgedoc_database_kind == 'sqlite' %}
+{% if cfg_hedgedoc.database.kind == 'sqlite' %}
 		"db": {
 			"dialect": "sqlite",
-			"storage": "{{var_hedgedoc_database_data_sqlite_path}}"
+			"storage": "{{cfg_hedgedoc.database.data.sqlite.path}}"
 		},
 {% endif %}
-{% if var_hedgedoc_database_kind == 'postgresql' %}
+{% if cfg_hedgedoc.database.kind == 'postgresql' %}
 		"db": {
 			"dialect": "postgres",
-			"host": "{{var_hedgedoc_database_data_postgresql_host}}",
+			"host": "{{cfg_hedgedoc.database.data.postgresql.host}}",
-			"port": {{var_hedgedoc_database_data_postgresql_port | to_json}},
+			"port": {{cfg_hedgedoc.database.data.postgresql.port | to_json}},
-			"username": "{{var_hedgedoc_database_data_postgresql_username}}",
+			"username": "{{cfg_hedgedoc.database.data.postgresql.username}}",
-			"password": "{{var_hedgedoc_database_data_postgresql_password}}",
+			"password": "{{cfg_hedgedoc.database.data.postgresql.password}}",
-			"database": "{{var_hedgedoc_database_data_postgresql_schema}}"
+			"database": "{{cfg_hedgedoc.database.data.postgresql.schema}}"
 		},
 {% endif %}
-		"sessionSecret": "{{var_hedgedoc_session_secret}}",
+		"sessionSecret": "{{cfg_hedgedoc.session_secret}}",
 		"host": "localhost",
 		"allowOrigin": [
 			"localhost"
 		],
-		"domain": "{{var_hedgedoc_domain}}",
+		"domain": "{{cfg_hedgedoc.domain}}",
 		"urlAddPort": false,
 		"protocolUseSSL": true,
-{% if var_hedgedoc_authentication_kind == 'internal' %}
+{% if cfg_hedgedoc.authentication.kind == 'internal' %}
 		"email": true,
 		"allowEmailRegister": true,
 {% endif %}
-{% if var_hedgedoc_authentication_kind == 'authelia' %}
+{% if cfg_hedgedoc.authentication.kind == 'authelia' %}
 		"oauth2": {
-			"providerName": "{{var_hedgedoc_authentication_data_authelia_provider_name}}",
+			"providerName": "{{cfg_hedgedoc.authentication.data.authelia.provider_name}}",
-			"clientID": "{{var_hedgedoc_authentication_data_authelia_client_id}}",
+			"clientID": "{{cfg_hedgedoc.authentication.data.authelia.client_id}}",
-			"clientSecret": "{{var_hedgedoc_authentication_data_authelia_client_secret}}",
+			"clientSecret": "{{cfg_hedgedoc.authentication.data.authelia.client_secret}}",
 			"scope": "openid email profile",
 			"userProfileUsernameAttr": "sub",
 			"userProfileDisplayNameAttr": "name",
 			"userProfileEmailAttr": "email",
-			"userProfileURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/userinfo",
+			"userProfileURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/userinfo",
-			"tokenURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/token",
+			"tokenURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/token",
-			"authorizationURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/authorize"
+			"authorizationURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/authorization"
 		},
 		"email": false,
 		"allowEmailRegister": false,
 {% endif %}
-		"allowAnonymous": {{var_hedgedoc_guest_allow_create | to_json}},
+		"allowAnonymous": {{cfg_hedgedoc.guest_allow_create | to_json}},
-		"allowAnonymousEdits": {{var_hedgedoc_guest_allow_change | to_json}},
+		"allowAnonymousEdits": {{cfg_hedgedoc.guest_allow_change | to_json}},
-{% if var_hedgedoc_free_names_mode == 'never' %}
+{% if cfg_hedgedoc.free_names_mode == 'never' %}
 		"allowFreeURL": false,
 		"requireFreeURLAuthentication": false,
 {% endif %}
-{% if var_hedgedoc_free_names_mode == 'authed' %}
+{% if cfg_hedgedoc.free_names_mode == 'authed' %}
 		"allowFreeURL": true,
 		"requireFreeURLAuthentication": true,
 {% endif %}
-{% if var_hedgedoc_free_names_mode == 'always' %}
+{% if cfg_hedgedoc.free_names_mode == 'always' %}
 		"allowFreeURL": true,
 		"requireFreeURLAuthentication": false,
 {% endif %}

roles/hedgedoc/templates/systemd-unit.j2

@@ -3,8 +3,8 @@ Description=Hedgedoc
 After=multi-user.target
 
 [Service]
-WorkingDirectory={{var_hedgedoc_directory}}
+WorkingDirectory={{cfg_hedgedoc.directory}}
-User={{var_hedgedoc_user_name}}
+User={{cfg_hedgedoc.user_name}}
 Environment="NODE_ENV=production"
 ExecStart=yarn start
 SyslogIdentifier=hedgedoc

roles/murmur/defaults/main.json

@@ -1,6 +1,8 @@
 {
 	"var_murmur_database_path": "/var/lib/mumble-server/mumble-server.sqlite",
+	"var_murmur_domain": "murmur.example.org",
 	"var_murmur_port": 64738,
 	"var_murmur_welcome_text": "<br />Welcome to this server running <b>Murmur</b>.<br />Enjoy your stay!<br />",
-	"var_murmur_admin_password": "REPLACE_ME"
+	"var_murmur_admin_password": "REPLACE_ME",
+	"var_murmur_tls": true
 }

roles/murmur/tasks/main.json

@@ -9,6 +9,30 @@
 			]
 		}
 	},
+	{
+		"name": "tls | directory",
+		"when": "var_murmur_tls",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "directory",
+			"path": "/var/murmurd"
+		}
+	},
+	{
+		"name": "tls | files",
+		"when": "var_murmur_tls",
+		"become": true,
+		"loop": [
+			{"from": "/etc/ssl/private/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-key.pem"},
+			{"from": "/etc/ssl/fullchains/{{var_murmur_domain}}.pem", "to": "/var/murmurd/tls-fullchain.pem"}
+		],
+		"ansible.builtin.copy": {
+			"remote_src": true,
+			"src": "{{item.from}}",
+			"dest": "{{item.to}}",
+			"mode": "0444"
+		}
+	},
 	{
 		"name": "configuration",
 		"become": true,

roles/murmur/templates/mumble-server.ini.j2

@@ -242,8 +242,13 @@ allowping=true
 
 ; If you have a proper SSL certificate, you can provide the filenames here.
 ; Otherwise, Murmur will create its own certificate automatically.
-;sslCert=
+{% if var_murmur_tls %}
+sslKey=/var/murmurd/tls-key.pem
+sslCert=/var/murmurd/tls-fullchain.pem
+{% else %}
 ;sslKey=
+;sslCert=
+{% endif %}
 
 ; If the keyfile specified above is encrypted with a passphrase, you can enter
 ; it in this setting. It must be plaintext, so you may wish to adjust the

roles/nginx/cfg.schema.json

@@ -0,0 +1,28 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"auto_reload_interval": {
+			"nullable": true,
+			"type": "integer",
+			"description": "in hours",
+			"default": null
+		},
+		"dhparam_size": {
+			"nullable": true,
+			"type": "integer",
+			"default": null
+		},
+		"improved_security": {
+			"nullable": false,
+			"type": "boolean",
+			"default": false
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"auto_reload_interval",
+		"dhparam_size",
+		"improved_security"
+	]
+}

roles/nginx/defaults/main.json

@@ -1,3 +1,7 @@
 {
-	"var_nginx_auto_reload_interval": null
+	"cfg_nginx_defaults": {
+		"auto_reload_interval": null,
+		"dhparam_size": null,
+		"improved_security": false
+	}
 }

roles/nginx/tasks/main.json

@@ -1,4 +1,11 @@
 [
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_nginx"
+		}
+	},
 	{
 		"name": "install packages",
 		"become": true,
@@ -12,7 +19,11 @@
 	},
 	{
 		"name": "generate dhparams file",
-		"ansible.builtin.command": "openssl dhparam -out /etc/nginx/dhparam 4096",
+		"when": "cfg_nginx.dhparam_size != None",
+		"become": true,
+		"ansible.builtin.command": {
+			"cmd": "openssl dhparam -out /etc/nginx/dhparam {{cfg_nginx.dhparam_size | string}}"
+		},
 		"args": {
 			"creates": "/etc/nginx/dhparam"
 		}
@@ -20,49 +31,54 @@
 	{
 		"name": "place hardening config",
 		"become": true,
-		"ansible.builtin.copy": {
+		"ansible.builtin.template": {
-			"src": "ssl-hardening.conf",
+			"src": "ssl-hardening.conf.j2",
 			"dest": "/etc/nginx/ssl-hardening.conf"
 		}
 	},
 	{
-		"name": "ufw | check",
+		"name": "ufw",
-		"become": true,
+		"block": [
-		"check_mode": true,
+			{
-		"community.general.ufw": {
+				"name": "check",
-			"state": "enabled"
+				"become": true,
-		},
+				"check_mode": true,
-		"register": "ufw_enable_check"
+				"community.general.ufw": {
-	},
+					"state": "enabled"
-	{
+				},
-		"name": "ufw | allow port 80",
+				"register": "ufw_enable_check"
-		"when": "not ufw_enable_check.changed",
+			},
-		"become": true,
+			{
-		"community.general.ufw": {
+				"name": "allow port 80",
-			"rule": "allow",
+				"when": "not ufw_enable_check.changed",
-			"port": "80",
+				"become": true,
-			"proto": "tcp"
+				"community.general.ufw": {
-		}
+					"rule": "allow",
-	},
+					"port": "80",
-	{
+					"proto": "tcp"
-		"name": "ufw | allow port 443",
+				}
-		"when": "not ufw_enable_check.changed",
+			},
-		"become": true,
+			{
-		"community.general.ufw": {
+				"name": "allow port 443",
-			"rule": "allow",
+				"when": "not ufw_enable_check.changed",
-			"port": "443",
+				"become": true,
-			"proto": "tcp"
+				"community.general.ufw": {
-		}
+					"rule": "allow",
+					"port": "443",
+					"proto": "tcp"
+				}
+			}
+		]
 	},
 	{
 		"name": "auto reload",
-		"when": "var_nginx_auto_reload_interval == None",
+		"when": "cfg_nginx.auto_reload_interval == None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": true,
 			"minute": "0",
-			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
+			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",
@@ -71,13 +87,13 @@
 	},
 	{
 		"name": "auto reload",
-		"when": "var_nginx_auto_reload_interval != None",
+		"when": "cfg_nginx.auto_reload_interval != None",
 		"become": true,
 		"ansible.builtin.cron": {
 			"name": "nginx_auto_reload",
 			"disabled": false,
 			"minute": "0",
-			"hour": "*/{{var_nginx_auto_reload_interval | string}}",
+			"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
 			"day": "*",
 			"month": "*",
 			"weekday": "*",

roles/nginx/templates/ssl-hardening.conf.j2

@@ -3,7 +3,9 @@ ssl_session_cache shared:MozSSL:10m;  # about 40000 sessions
 ssl_session_tickets off;
 
 # curl https://ssl-config.mozilla.org/ffdhe2048.txt > /path/to/dhparam
+{% if cfg_nginx.dhparam_size != None %}
 ssl_dhparam /etc/nginx/dhparam;
+{% endif %}
 
 # intermediate configuration
 ssl_protocols TLSv1.2 TLSv1.3;

roles/nginx/vardef.json

@@ -1,8 +0,0 @@
-{
-	"auto_reload_interval": {
-		"description": "in hours",
-		"nullable": true,
-		"type": "integer",
-		"mandatory": false
-	}
-}

roles/owncloud-and-nginx/cfg.schema.json

@@ -0,0 +1,31 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"tls_mode": {
+			"nullable": false,
+			"type": "string",
+			"enum": [
+				"disable",
+				"enable",
+				"force"
+			],
+			"default": "force"
+		},
+		"maximum_upload_size": {
+			"nullable": false,
+			"type": "string",
+			"default": "1G"
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"domain",
+		"tls_mode",
+		"maximum_upload_size"
+	]
+}

roles/owncloud-and-nginx/defaults/main.json

@@ -0,0 +1,6 @@
+{
+	"cfg_owncloud_and_nginx_defaults": {
+		"tls_mode": "force",
+		"maximum_upload_size": "1G"
+	}
+}

roles/owncloud-and-nginx/tasks/main.json

@@ -0,0 +1,42 @@
+[
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_owncloud_and_nginx"
+		}
+	},
+	{
+		"name": "deactivate default site",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "absent",
+			"dest": "/etc/nginx/sites-enabled/default"
+		}
+	},
+	{
+		"name": "emplace configuration | data",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "conf.j2",
+			"dest": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}"
+		}
+	},
+	{
+		"name": "emplace configuration | link",
+		"become": true,
+		"ansible.builtin.file": {
+			"state": "link",
+			"src": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}",
+			"dest": "/etc/nginx/sites-enabled/{{cfg_owncloud_and_nginx.domain}}"
+		}
+	},
+	{
+		"name": "restart nginx",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"state": "restarted",
+			"name": "nginx"
+		}
+	}
+]

roles/owncloud-and-nginx/templates/conf.j2

@@ -0,0 +1,34 @@
+{% macro owncloud_common() %}
+	location / {
+		proxy_pass http://localhost:9200;
+		client_max_body_size {{cfg_owncloud_and_nginx.maximum_upload_size}};
+	}
+{% endmacro %}
+
+server {
+	listen 80;
+	listen [::]:80;
+	
+	server_name {{cfg_owncloud_and_nginx.domain}};
+	
+{% if cfg_owncloud_and_nginx.tls_mode == 'force' %}
+	return 301 https://$http_host$request_uri;
+{% else %}
+	{{ owncloud_common() }}
+{% endif %}
+}
+
+{% if cfg_owncloud_and_nginx.tls_mode != 'disable' %}
+server {
+	listen 443 ssl;
+	listen [::]:443 ssl;
+	
+	server_name {{cfg_owncloud_and_nginx.domain}};
+	
+	ssl_certificate_key /etc/ssl/private/{{cfg_owncloud_and_nginx.domain}}.pem;
+	ssl_certificate /etc/ssl/fullchains/{{cfg_owncloud_and_nginx.domain}}.pem;
+	include /etc/nginx/ssl-hardening.conf;
+	
+	{{ owncloud_common() }}
+}
+{% endif %}

roles/owncloud/cfg.schema.json

@@ -0,0 +1,152 @@
+{
+	"nullable": false,
+	"type": "object",
+	"properties": {
+		"user": {
+			"nullable": false,
+			"type": "string",
+			"default": "owncloud"
+		},
+		"directory": {
+			"nullable": false,
+			"type": "string",
+			"default": "/opt/owncloud"
+		},
+		"version": {
+			"nullable": false,
+			"type": "string",
+			"default": "7.2.0"
+		},
+		"platform": {
+			"nullable": false,
+			"type": "string",
+			"default": "linux-amd64"
+		},
+		"domain": {
+			"nullable": false,
+			"type": "string"
+		},
+		"admin_password": {
+			"nullable": false,
+			"type": "string"
+		},
+		"authentication": {
+			"anyOf": [
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"type": "string",
+							"enum": ["internal"],
+							"default": "internal"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+							},
+							"additionalProperties": false,
+							"required": [
+							],
+							"default": {
+							}
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				},
+				{
+					"nullable": false,
+					"type": "object",
+					"properties": {
+						"kind": {
+							"type": "string",
+							"enum": ["authelia"],
+							"default": "authelia"
+						},
+						"data": {
+							"nullable": false,
+							"type": "object",
+							"properties": {
+								"url_base": {
+									"nullable": false,
+									"type": "string"
+								},
+								"web": {
+									"nullable": true,
+									"type": "object",
+									"properties": {
+										"client_id": {
+											"type": "string",
+											"mandatory": false,
+											"default": "owncloud_web"
+										}
+									},
+									"additionalProperties": false,
+									"required": [
+										"client_id"
+									],
+									"default": {
+									}
+								}
+							},
+							"additionalProperties": false,
+							"required": [
+								"url_base",
+								"web"
+							]
+						}
+					},
+					"additionalProperties": false,
+					"required": [
+						"kind",
+						"data"
+					]
+				}
+			]
+		},
+		"public_share": {
+			"nullable": false,
+			"type": "object",
+			"properties": {
+				"password_necessity": {
+					"nullable": false,
+					"type": "string",
+					"enum": [
+						"nothing",
+						"writable",
+						"all"
+					],
+					"default": "writable"
+				},
+				"password_policy_active": {
+					"nullable": false,
+					"type": "boolean",
+					"default": true
+				}
+			},
+			"additionalProperties": false,
+			"required": [
+				"password_necessity",
+				"password_policy_active"
+			],
+			"default": {
+			}
+		}
+	},
+	"additionalProperties": false,
+	"required": [
+		"user",
+		"directory",
+		"version",
+		"platform",
+		"domain",
+		"admin_password",
+		"authentication",
+		"public_share"
+	]
+}

roles/owncloud/defaults/main.json

@@ -0,0 +1,16 @@
+{
+	"cfg_owncloud_defaults": {
+		"user": "owncloud",
+		"directory": "/opt/owncloud",
+		"version": "7.2.0",
+		"platform": "linux-amd64",
+		"domain": "owncloud.example.org",
+		"authentication": {
+			"kind": "internal"
+		},
+		"public_share": {
+			"password_necessity": "writable",
+			"password_policy_active": true
+		}
+	}
+}

roles/owncloud/info.md

@@ -0,0 +1,32 @@
+## Beschreibung
+
+Cloud-Plattform [ownCloud](https://owncloud.com/) (the rewrite in Go named "Infinite Scale")
+
+
+## Verweise
+
+- [ownCloud-Dokumentation | How to install ownCloud Infinite Scale Tech Preview in three easy steps](https://owncloud.com/news/howto-install-owncloud-infinite-scale-tech-preview/)
+- [ownCloud-Dokumentation | oCIS](https://owncloud.dev/ocis/)
+- [ownCloud-Dokumentation | Upgrading](https://doc.owncloud.com/ocis/next/migration/upgrading-ocis.html)
+- [ownCloud-Dokumentation | env var types](https://doc.owncloud.com/ocis/next/deployment/services/envvar-types-description.html)
+- [ownCloud-Dokumentation | Service | Web](https://doc.owncloud.com/ocis/next/deployment/services/s-list/web.html)
+- [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html)
+- [ownCloud-Dokumentation | Service | Sharing](https://doc.owncloud.com/ocis/next/deployment/services/s-list/sharing.html)
+- [GitHub | ocis](https://github.com/owncloud/ocis/)
+- [ownCloud-Foren | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222)
+
+
+## Bemerkungen
+
+- die `.ocis/config/ocis.yaml` wird erzeugt auf Grundlage der `.env`
+- `.ocis/config/ocis.yaml` sollte niemals einfach neu erstellt werden, da man sich sonst nicht mehr einloggen kann
+- wenn man sich plötzlich nicht mehr über OIDC anmelden kann, kann das daran lieget, dass `.ocis/idm/ldap.crt` abgelaufen ist — siehe dazu [diesen Thread](https://central.owncloud.org/t/certificate-error-after-upgrade-to-5-0-0-from-4-0-6/47824/7); man könnte auch `OCIS_LDAP_INSECURE` auf `true` setzen, aber naja…
+
+
+## ToDo
+
+- Download prüfen
+- `csp.yaml` einsetzen
+- prüfen ob folgende `.env`-Variablen gebraucht werden:
+  - `PROXY_OIDC_ISSUER`
+  - `PROXY_OIDC_SKIP_USER_INFO`

roles/owncloud/tasks/main.json

@@ -0,0 +1,87 @@
+[
+	{
+		"name": "show vars",
+		"when": "switch_show_vars",
+		"ansible.builtin.debug": {
+			"var": "vars.cfg_owncloud"
+		}
+	},
+	{
+		"name": "user",
+		"become": true,
+		"ansible.builtin.user": {
+			"name": "{{cfg_owncloud.user}}",
+			"create_home": true,
+			"home": "{{cfg_owncloud.directory}}"
+		}
+	},
+	{
+		"name": "download",
+		"become": true,
+		"become_user": "{{cfg_owncloud.user}}",
+		"ansible.builtin.get_url": {
+			"url": "https://download.owncloud.com/ocis/ocis/stable/{{cfg_owncloud.version}}/ocis-{{cfg_owncloud.version}}-{{cfg_owncloud.platform}}",
+			"dest": "{{cfg_owncloud.directory}}/ocis",
+			"mode": "u+rx"
+		}
+	},
+	{
+		"name": "directories",
+		"become": true,
+		"become_user": "{{cfg_owncloud.user}}",
+		"loop": [
+			"log"
+		],
+		"ansible.builtin.file": {
+			"state": "directory",
+			"recurse": true,
+			"path": "{{cfg_owncloud.directory}}/{{item}}"
+		}
+	},
+	{
+		"name": "csp",
+		"become": true,
+		"become_user": "{{cfg_owncloud.user}}",
+		"ansible.builtin.template": {
+			"src": "csp.yaml.j2",
+			"mode": "644",
+			"dest": "{{cfg_owncloud.directory}}/csp.yaml"
+		}
+	},
+	{
+		"name": "env",
+		"become": true,
+		"become_user": "{{cfg_owncloud.user}}",
+		"ansible.builtin.template": {
+			"src": "env.j2",
+			"mode": "644",
+			"dest": "{{cfg_owncloud.directory}}/.env"
+		}
+	},
+	{
+		"name": "setup",
+		"become": true,
+		"become_user": "{{cfg_owncloud.user}}",
+		"ansible.builtin.shell": {
+			"chdir": "{{cfg_owncloud.directory}}",
+			"cmd": "./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}"
+		}
+	},
+	{
+		"name": "systemd unit",
+		"become": true,
+		"ansible.builtin.template": {
+			"src": "systemd_unit.j2",
+			"dest": "/etc/systemd/system/owncloud.service"
+		}
+	},
+	{
+		"name": "run",
+		"become": true,
+		"ansible.builtin.systemd_service": {
+			"name": "owncloud",
+			"enabled": true,
+			"state": "restarted"
+		}
+	}
+]

roles/owncloud/templates/csp.yaml.j2

@@ -0,0 +1,7 @@
+directives:
+  connect-src:
+    - '''self'''
+    - 'https://{{cfg_owncloud.domain}}'
+{% if cfg_owncloud.authentication.kind == 'authelia' %}
+    - '{{cfg_owncloud.authentication.data.url_base}}'
+{% endif %}

roles/owncloud/templates/env.j2

@@ -0,0 +1,62 @@
+## web client
+WEB_LOG_LEVEL=info
+WEB_LOG_FILE={{cfg_owncloud.directory}}/log/web
+WEB_LOG_PRETTY=true
+WEB_LOG_COLOR=true
+{% if cfg_owncloud.authentication.kind == 'internal' %}
+{% endif %}
+{% if cfg_owncloud.authentication.kind == 'authelia' %}
+WEB_OIDC_AUTHORITY={{cfg_owncloud.authentication.data.url_base}}
+WEB_OIDC_CLIENT_ID={{cfg_owncloud.authentication.data.web.client_id}}
+WEB_OIDC_RESPONSE_TYPE=code
+WEB_OIDC_SCOPE=openid profile email groups
+WEB_OPTION_LOGIN_URL={{cfg_owncloud.authentication.data.url_base}}
+WEB_OPTION_LOGOUT_URL={{cfg_owncloud.authentication.data.url_base}}
+WEB_UI_THEME_SERVER=https://{{cfg_owncloud.domain}}
+WEB_UI_CONFIG_SERVER=https://{{cfg_owncloud.domain}}
+{% endif %}
+
+## other clients
+PROXY_LOG_LEVEL=info
+PROXY_LOG_FILE={{cfg_owncloud.directory}}/log/proxy
+PROXY_LOG_PRETTY=true
+PROXY_LOG_COLOR=true
+PROXY_CSP_CONFIG_FILE_LOCATION={{cfg_owncloud.directory}}/csp.yaml
+PROXY_TLS=false
+{% if cfg_owncloud.authentication.kind == 'internal' %}
+PROXY_AUTOPROVISION_ACCOUNTS=false
+{% endif %}
+{% if cfg_owncloud.authentication.kind == 'authelia' %}
+OCIS_URL=https://{{cfg_owncloud.domain}}
+PROXY_OIDC_ISSUER={{cfg_owncloud.authentication.data.url_base}}
+PROXY_OIDC_REWRITE_WELLKNOWN=true
+PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD=none
+PROXY_OIDC_SKIP_USER_INFO=false
+PROXY_AUTOPROVISION_ACCOUNTS=true
+PROXY_AUTOPROVISION_CLAIM_USERNAME=preferred_username
+PROXY_AUTOPROVISION_CLAIM_EMAIL=email
+PROXY_AUTOPROVISION_CLAIM_DISPLAYNAME=name
+PROXY_AUTOPROVISION_CLAIM_GROUPS=groups
+PROXY_USER_OIDC_CLAIM=preferred_username
+PROXY_USER_CS3_CLAIM=username
+{% endif %}
+
+## sharing
+{% if cfg_owncloud.public_share.password_necessity == 'nothing' %}
+OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
+OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=false
+{% endif %}
+{% if cfg_owncloud.public_share.password_necessity == 'writable' %}
+OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
+OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
+{% endif %}
+{% if cfg_owncloud.public_share.password_necessity == 'all' %}
+OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=true
+OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
+{% endif %}
+{% if cfg_owncloud.public_share.password_policy_active %}
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=false
+{% else %}
+OCIS_SHARING_PASSWORD_POLICY_DISABLED=true
+{% endif %}
+

roles/owncloud/templates/systemd_unit.j2

@@ -0,0 +1,15 @@
+[Unit]
+Description=ownCloud
+After=network.target
+
+[Service]
+WorkingDirectory={{cfg_owncloud.directory}}
+EnvironmentFile={{cfg_owncloud.directory}}/.env
+ExecStart={{cfg_owncloud.directory}}/ocis server
+Type=simple
+Restart=always
+User={{cfg_owncloud.user}}
+
+[Install]
+WantedBy=default.target
+RequiredBy=network.target

roles/postgresql-for-authelia/tasks/main.json

@@ -39,7 +39,7 @@
 		"become_user": "postgres",
 		"community.postgresql.postgresql_privs": {
 			"state": "present",
-			"db": "{{var_postgresql_for_authelia_schema}}",
+			"login_db": "{{var_postgresql_for_authelia_schema}}",
 			"objs": "ALL_IN_SCHEMA",
 			"roles": "{{var_postgresql_for_authelia_username}}",
 			"privs": "ALL",

roles/postgresql-for-forgejo/defaults/main.json

@@ -0,0 +1,5 @@
+{
+	"var_postgresql_for_forgejo_username": "forgejo_user",
+	"var_postgresql_for_forgejo_password": "REPLACE_ME",
+	"var_postgresql_for_forgejo_schema": "forgejo"
+}

roles/postgresql-for-forgejo/tasks/main.json

@@ -0,0 +1,49 @@
+[
+	{
+		"name": "packages",
+		"become": true,
+		"ansible.builtin.apt": {
+			"update_cache": true,
+			"pkg": [
+				"acl",
+				"python3-psycopg2"
+			]
+		}
+	},
+	{
+		"name": "user",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_user": {
+			"state": "present",
+			"name": "{{var_postgresql_for_forgejo_username}}",
+			"password": "{{var_postgresql_for_forgejo_password}}"
+		},
+		"environment": {
+			"PGOPTIONS": "-c password_encryption=scram-sha-256"
+		}
+	},
+	{
+		"name": "schema",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_db": {
+			"state": "present",
+			"name": "{{var_postgresql_for_forgejo_schema}}",
+			"owner": "{{var_postgresql_for_forgejo_username}}"
+		}
+	},
+	{
+		"name": "rights",
+		"become": true,
+		"become_user": "postgres",
+		"community.postgresql.postgresql_privs": {
+			"state": "present",
+			"login_db": "{{var_postgresql_for_forgejo_schema}}",
+			"objs": "ALL_IN_SCHEMA",
+			"roles": "{{var_postgresql_for_forgejo_username}}",
+			"privs": "ALL",
+			"grant_option": true
+		}
+	}
+]