From e7276d2e7eb7f331b691863aa95987afe65cf34e Mon Sep 17 00:00:00 2001 From: Robert de Bock Date: Wed, 31 Mar 2021 09:31:02 +0200 Subject: [PATCH] Introduce collections in molecule too. --- molecule/default/verify.yml | 8 ++++---- templates/httpd.conf-Alpine.j2 | 26 ++++++++++++------------- templates/httpd.conf-Archlinux.j2 | 32 +++++++++++++++---------------- templates/httpd.conf-RedHat.j2 | 26 ++++++++++++------------- templates/httpd.conf-Suse.j2 | 20 +++++++++---------- templates/listen.conf.j2 | 4 ++-- 6 files changed, 58 insertions(+), 58 deletions(-) diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 359c0ed..d52a4fb 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -8,7 +8,7 @@ tasks: - name: check if ports are open - wait_for: + ansible.builtin.wait_for: port: "{{ item }}" timeout: 2 loop: @@ -16,18 +16,18 @@ - "8443" - name: place sample index.html - copy: + ansible.builtin.copy: content: "Hello World!" dest: "{{ httpd_data_directory }}/index.html" mode: "0644" - name: see if the sample index.html returns 200 - uri: + ansible.builtin.uri: url: "https://127.0.0.1:8443/" validate_certs: no - name: see if TRACE option returns 405 - uri: + ansible.builtin.uri: url: "https://127.0.0.1:8443/" method: TRACE status_code: diff --git a/templates/httpd.conf-Alpine.j2 b/templates/httpd.conf-Alpine.j2 index 4c33a4a..ebae7ad 100644 --- a/templates/httpd.conf-Alpine.j2 +++ b/templates/httpd.conf-Alpine.j2 @@ -4,20 +4,20 @@ # This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. # See for detailed information. -# In particular, see +# In particular, see # # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. +# consult the online docs. You have been warned. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/access_log" # with ServerRoot set to "/usr/local/apache2" will be interpreted by the -# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" # will be interpreted as '/logs/access_log'. # @@ -57,7 +57,7 @@ ServerRoot /var/www # ports, instead of the default. See also the # directive. # -# Change this to Listen on specific IP addresses as shown below to +# Change this to Listen on specific IP addresses as shown below to # prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 @@ -172,7 +172,7 @@ LoadModule negotiation_module modules/mod_negotiation.so # # If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. +# httpd as root initially and it will switch. # # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for @@ -223,7 +223,7 @@ ServerSignature On # # Deny access to the entirety of your server's filesystem. You must -# explicitly permit access to web content directories in other +# explicitly permit access to web content directories in other # blocks below. # @@ -281,8 +281,8 @@ DocumentRoot "/var/www/localhost/htdocs" # -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. # Require all denied @@ -335,8 +335,8 @@ LogLevel warn # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client # will make a new request for the document at its new location. # Example: # Redirect permanent /foo http://www.example.com/bar @@ -353,7 +353,7 @@ LogLevel warn # the filesystem path. # - # ScriptAlias: This controls which directories contain server scripts. + # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the target directory are treated as applications and # run by the server when requested rather than as documents sent to the @@ -467,10 +467,10 @@ LogLevel warn #MaxRanges unlimited # -# EnableMMAP and EnableSendfile: On systems that support it, +# EnableMMAP and EnableSendfile: On systems that support it, # memory-mapping or the sendfile syscall may be used to deliver # files. This usually improves server performance, but must -# be turned off when serving from networked-mounted +# be turned off when serving from networked-mounted # filesystems or if support for these functions is otherwise # broken on your system. # Defaults: EnableMMAP On, EnableSendfile Off diff --git a/templates/httpd.conf-Archlinux.j2 b/templates/httpd.conf-Archlinux.j2 index aa35051..1cd77fc 100644 --- a/templates/httpd.conf-Archlinux.j2 +++ b/templates/httpd.conf-Archlinux.j2 @@ -4,20 +4,20 @@ # This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. # See for detailed information. -# In particular, see +# In particular, see # # for a discussion of each configuration directive. # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. +# consult the online docs. You have been warned. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the # server will use that explicit path. If the filenames do *not* begin # with "/", the value of ServerRoot is prepended -- so "logs/access_log" # with ServerRoot set to "/usr/local/apache2" will be interpreted by the -# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" +# server as "/usr/local/apache2/logs/access_log", whereas "/logs/access_log" # will be interpreted as '/logs/access_log'. # @@ -47,7 +47,7 @@ ServerRoot "/etc/httpd" # ports, instead of the default. See also the # directive. # -# Change this to Listen on specific IP addresses as shown below to +# Change this to Listen on specific IP addresses as shown below to # prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 @@ -193,7 +193,7 @@ LoadModule alias_module modules/mod_alias.so # # If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. +# httpd as root initially and it will switch. # # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for @@ -234,7 +234,7 @@ ServerAdmin you@example.com # # Deny access to the entirety of your server's filesystem. You must -# explicitly permit access to web content directories in other +# explicitly permit access to web content directories in other # blocks below. # @@ -292,8 +292,8 @@ DocumentRoot "/srv/http" # -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. # Require all denied @@ -346,8 +346,8 @@ LogLevel warn # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client # will make a new request for the document at its new location. # Example: # Redirect permanent /foo http://www.example.com/bar @@ -364,7 +364,7 @@ LogLevel warn # the filesystem path. # - # ScriptAlias: This controls which directories contain server scripts. + # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the target directory are treated as applications and # run by the server when requested rather than as documents sent to the @@ -476,10 +476,10 @@ LogLevel warn #MaxRanges unlimited # -# EnableMMAP and EnableSendfile: On systems that support it, +# EnableMMAP and EnableSendfile: On systems that support it, # memory-mapping or the sendfile syscall may be used to deliver # files. This usually improves server performance, but must -# be turned off when serving from networked-mounted +# be turned off when serving from networked-mounted # filesystems or if support for these functions is otherwise # broken on your system. # Defaults: EnableMMAP On, EnableSendfile Off @@ -489,9 +489,9 @@ LogLevel warn # Supplemental configuration # -# The configuration files in the conf/extra/ directory can be -# included to add extra features or to modify the default configuration of -# the server, or you may simply copy their contents here and change as +# The configuration files in the conf/extra/ directory can be +# included to add extra features or to modify the default configuration of +# the server, or you may simply copy their contents here and change as # necessary. # Server-pool management (MPM specific) diff --git a/templates/httpd.conf-RedHat.j2 b/templates/httpd.conf-RedHat.j2 index acf8241..ce2433f 100644 --- a/templates/httpd.conf-RedHat.j2 +++ b/templates/httpd.conf-RedHat.j2 @@ -4,7 +4,7 @@ # This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. # See for detailed information. -# In particular, see +# In particular, see # # for a discussion of each configuration directive. # @@ -13,7 +13,7 @@ # # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure -# consult the online docs. You have been warned. +# consult the online docs. You have been warned. # # Configuration and logfile names: If the filenames you specify for many # of the server's control files begin with "/" (or "drive:/" for Win32), the @@ -40,7 +40,7 @@ ServerRoot "/etc/httpd" # ports, instead of the default. See also the # directive. # -# Change this to Listen on specific IP addresses as shown below to +# Change this to Listen on specific IP addresses as shown below to # prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 @@ -62,7 +62,7 @@ Include conf.modules.d/*.conf # # If you wish httpd to run as a different user or group, you must run -# httpd as root initially and it will switch. +# httpd as root initially and it will switch. # # User/Group: The name (or #number) of the user/group to run httpd as. # It is usually good practice to create a dedicated user and group for @@ -101,7 +101,7 @@ ServerAdmin root@localhost # # Deny access to the entirety of your server's filesystem. You must -# explicitly permit access to web content directories in other +# explicitly permit access to web content directories in other # blocks below. # @@ -170,8 +170,8 @@ DocumentRoot "/var/www/html" # -# The following lines prevent .htaccess and .htpasswd files from being -# viewed by Web clients. +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. # Require all denied @@ -224,8 +224,8 @@ LogLevel warn # - # Redirect: Allows you to tell clients about documents that used to - # exist in your server's namespace, but do not anymore. The client + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client # will make a new request for the document at its new location. # Example: # Redirect permanent /foo http://www.example.com/bar @@ -242,7 +242,7 @@ LogLevel warn # the filesystem path. # - # ScriptAlias: This controls which directories contain server scripts. + # ScriptAlias: This controls which directories contain server scripts. # ScriptAliases are essentially the same as Aliases, except that # documents in the target directory are treated as applications and # run by the server when requested rather than as documents sent to the @@ -313,7 +313,7 @@ LogLevel warn # # Specify a default charset for all content served; this enables -# interpretation of all content as UTF-8 by default. To use the +# interpretation of all content as UTF-8 by default. To use the # default browser choice (ISO-8859-1), or to allow the META tags # in HTML content to override this choice, comment out this # directive: @@ -341,10 +341,10 @@ AddDefaultCharset UTF-8 # # -# EnableMMAP and EnableSendfile: On systems that support it, +# EnableMMAP and EnableSendfile: On systems that support it, # memory-mapping or the sendfile syscall may be used to deliver # files. This usually improves server performance, but must -# be turned off when serving from networked-mounted +# be turned off when serving from networked-mounted # filesystems or if support for these functions is otherwise # broken on your system. # Defaults if commented: EnableMMAP On, EnableSendfile Off diff --git a/templates/httpd.conf-Suse.j2 b/templates/httpd.conf-Suse.j2 index 2307038..b8b0957 100644 --- a/templates/httpd.conf-Suse.j2 +++ b/templates/httpd.conf-Suse.j2 @@ -1,7 +1,7 @@ {{ ansible_managed | comment }} # -# /etc/apache2/httpd.conf +# /etc/apache2/httpd.conf # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. @@ -23,7 +23,7 @@ # Overview of include files, chronologically: # # httpd.conf -# | +# | # |-- uid.conf . . . . . . . . . . . . . . UserID/GroupID to run under # |-- server-tuning.conf . . . . . . . . . sizing of the server (how many processes to start, ...) # |-- loadmodule.conf . . . . . . . . . . . [*] load these modules @@ -141,9 +141,9 @@ Include /etc/apache2/mod_info.conf # with the configured default values. You shouldn't notice it at all. Include /etc/apache2/mod_reqtimeout.conf -# Fix for CVE-2014-0231 introduces new configuration parameter -# CGIDScriptTimeout. This directive and its effect prevent request -# workers to be eaten until starvation if cgi programs do not send +# Fix for CVE-2014-0231 introduces new configuration parameter +# CGIDScriptTimeout. This directive and its effect prevent request +# workers to be eaten until starvation if cgi programs do not send # output back to the server within the timout set by CGIDScriptTimeout. Include /etc/apache2/mod_cgid-timeout.conf @@ -161,7 +161,7 @@ Include /etc/apache2/mod_mime-defaults.conf # set up (customizable) error responses Include /etc/apache2/errors.conf -# global (server-wide) SSL configuration, that is not specific to +# global (server-wide) SSL configuration, that is not specific to # any virtual host Include /etc/apache2/ssl-global.conf @@ -229,10 +229,10 @@ Include /etc/apache2/default-server.conf IncludeOptional /etc/apache2/vhosts.d/*.conf -# Note: instead of adding your own configuration here, consider +# Note: instead of adding your own configuration here, consider # adding it in your own file (/etc/apache2/httpd.conf.local) -# putting its name into APACHE_CONF_INCLUDE_FILES in -# /etc/sysconfig/apache2 -- this will make system updates -# easier :) +# putting its name into APACHE_CONF_INCLUDE_FILES in +# /etc/sysconfig/apache2 -- this will make system updates +# easier :) TraceEnable Off diff --git a/templates/listen.conf.j2 b/templates/listen.conf.j2 index eab2719..3d135f4 100644 --- a/templates/listen.conf.j2 +++ b/templates/listen.conf.j2 @@ -5,10 +5,10 @@ # # http://httpd.apache.org/docs/2.4/mod/mpm_common.html#listen # -# Change this to Listen on specific IP addresses as shown below to +# Change this to Listen on specific IP addresses as shown below to # prevent Apache from glomming onto all bound IP addresses (0.0.0.0) # -# When we also provide SSL we have to listen to the +# When we also provide SSL we have to listen to the # standard HTTP port (see above) and to the HTTPS port # # Note: Configurations that use IPv6 but not IPv4-mapped addresses need two