From fc7817c0b808a3337eb3ffeb8f40ad6c85529eec Mon Sep 17 00:00:00 2001 From: s0dy Date: Thu, 1 Nov 2018 18:49:58 +0100 Subject: [PATCH] Auth --- ops/ansible/httpd-centos.yml | 50 ++-- ops/ansible/templates/httpd.j2 | 371 +++++++++++++++++++++++++++ ops/ansible/templates/phpMyAdmin.j2 | 10 +- ops/ansible/templates/virtualhost.j2 | 17 -- 4 files changed, 406 insertions(+), 42 deletions(-) create mode 100644 ops/ansible/templates/httpd.j2 delete mode 100644 ops/ansible/templates/virtualhost.j2 diff --git a/ops/ansible/httpd-centos.yml b/ops/ansible/httpd-centos.yml index 6bb7faa..96d1b59 100644 --- a/ops/ansible/httpd-centos.yml +++ b/ops/ansible/httpd-centos.yml @@ -20,28 +20,40 @@ enabled: yes masked: no - - name: Systemd start httpd - systemd: - name: httpd - state: started - - - name: Permissions httpd + - name: Permissions /etc/httpd + file: + path: /etc/httpd + owner: apache + group: apache + recurse: yes + + - name: Permissions /var/www file: path: /var/www owner: apache group: apache recurse: yes - #- htpasswd: - #path: /etc/apache2/.htpasswd - #name: hifive - #password: hifive - #owner: root - #group: www-data - #mode: 0640 -# - #- name: Create virtual host file - #template: - #src: virtualhost.j2 - #dest: /etc/apache2/sites-available/{{ domain }}.conf - #force: yes + - name: Install python-passlib + yum: + name: python-passlib + state: latest + + - htpasswd: + path: /etc/httpd/passwords + name: hifive + password: hifive + owner: apache + group: apache + mode: 0640 + + - name: Create httpd.conf + template: + src: httpd.j2 + dest: /etc/httpd/conf/httpd.conf + force: yes + + - name: Systemd start httpd + systemd: + name: httpd + state: started diff --git a/ops/ansible/templates/httpd.j2 b/ops/ansible/templates/httpd.j2 new file mode 100644 index 0000000..f8982e8 --- /dev/null +++ b/ops/ansible/templates/httpd.j2 @@ -0,0 +1,371 @@ +# +# 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 +# +# 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. +# +# 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 'log/access_log' +# with ServerRoot set to '/www' will be interpreted by the +# server as '/www/log/access_log', where as '/log/access_log' will be +# interpreted as '/log/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/etc/httpd" + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# 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 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +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. +# +# 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 +# running httpd, as with most system services. +# +User apache +Group apache + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# + +DocumentRoot "/var/www/html" + +# +# Relax access to content within /var/www. +# + + AllowOverride None + # Allow open access: + Require all granted + + +# Further relax access to the default document root: + + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride None + + # + # Controls who can get stuff from this server. + # + # Require all granted + + AuthType Basic + AuthName "Restricted Content" + AuthBasicProvider file + AuthUserFile /etc/httpd/passwords + Require valid-user + + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/error_log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog "logs/access_log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + CustomLog "logs/access_log" combined + + + + # + # 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 + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # 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 + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + + + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig /etc/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + + +# +# Specify a default charset for all content served; this enables +# 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: +# +AddDefaultCharset UTF-8 + + + # + # The mod_mime_magic module allows the server to use various hints from the + # contents of the file itself to determine its type. The MIMEMagicFile + # directive tells the module where the hint definitions are located. + # + MIMEMagicFile conf/magic + + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# 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 +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults if commented: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +EnableSendfile on + +# Enable HTTP/2 by default +# +# https://httpd.apache.org/docs/2.4/mod/core.html#protocols + + + Protocols h2 h2c http/1.1 + + + +# Supplemental configuration +# +# Load config files in the "/etc/httpd/conf.d" directory, if any. +IncludeOptional conf.d/*.conf diff --git a/ops/ansible/templates/phpMyAdmin.j2 b/ops/ansible/templates/phpMyAdmin.j2 index 84758c1..93bcb6b 100644 --- a/ops/ansible/templates/phpMyAdmin.j2 +++ b/ops/ansible/templates/phpMyAdmin.j2 @@ -15,15 +15,14 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # Apache 2.4 Require all granted - Require ip 127.0.0.1 - Require ip ::1 + #Require ip 127.0.0.1 + #Require ip ::1 # Apache 2.2 Order Deny,Allow Deny from All - Allow from 90.105.114.249 Allow from 127.0.0.1 Allow from ::1 @@ -34,15 +33,14 @@ Alias /phpmyadmin /usr/share/phpMyAdmin # Apache 2.4 Require all granted - Require ip 127.0.0.1 - Require ip ::1 + #Require ip 127.0.0.1 + #Require ip ::1 # Apache 2.2 Order Deny,Allow Deny from All - Allow from 90.105.114.249 Allow from 127.0.0.1 Allow from ::1 diff --git a/ops/ansible/templates/virtualhost.j2 b/ops/ansible/templates/virtualhost.j2 deleted file mode 100644 index bb5914b..0000000 --- a/ops/ansible/templates/virtualhost.j2 +++ /dev/null @@ -1,17 +0,0 @@ - - ServerAdmin webmaster@{{ domain }} - ServerName {{ domain }} - ServerAlias www.{{ domain }} - - DocumentRoot /var/www/{{ domain }} - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/access.log combined - - - AuthType Basic - AuthName "Restricted Content" - AuthUserFile /etc/apache2/.htpasswd - Require valid-user - -