Changeset f2215d09 in darkpeak-services

Timestamp:

Sep 28, 2018, 12:54:43 AM (2 years ago)

Author:

Mat Booth <mat.booth@…>

Branches:

keycloak, master, pleroma

Children:

f97b97d9

Parents:

04cf77d5

Message:

Fix CNAME functionality for static page hosting

Fixes #9

Location:

roles

Files:

• apache2/defaults/main.yml (modified) (1 diff)
• apache2/files/index.html (added)
• apache2/tasks/main.yml (modified) (1 diff)
• apache2/templates/apache.incl.conf.j2 (modified) (1 diff)
• apache2/templates/apache.vhost.conf.j2 (modified) (3 diffs)
• mediawiki/defaults/main.yml (modified) (1 diff)
• pages/files/repo-specific/pages (modified) (2 diffs)
• pages/tasks/main.yml (modified) (1 diff)

roles/apache2/defaults/main.yml

@@ -1 +1 @@
 service_name: default
-domain: "{{ domain_name }}"
+
+# Not specifying a domain makes this the default vhost
+domain: ""
 domain_alias: ""
 
-# The name of the service that is providing our home page,
-# apache2 will redirect the default bare domain to this service
-redirect_to_service: wiki
+web_root: "{{ default_web_root }}/{{ service_name }}"

roles/apache2/tasks/main.yml

@@ -69 +69 @@
 - name: Configure apache for default site
   include: configure-apache-site.yml
+
+- name: Install placeholder index for default site
+  copy:
+    src: index.html
+    dest: "{{ web_root }}/index.html"
+    group: www-data
+    owner: root
+    mode: 0640
+
+- name: TODO - Add users to the www-data group instead of setting 777 here
+  file:
+    state: directory
+    path:  "{{ web_root }}"
+    group: www-data
+    owner: root
+    mode:  0777

roles/apache2/templates/apache.incl.conf.j2

@@ -1 @@
-# This file is for service-specific apache configuration
+# This is the default, catch-all vhost, so we probably want to
+# do something based on the hostname of incoming requests
+
+# Use of rewrite engine is necessary in order to interrogate
+# the server variables like HTTP_HOST
+RewriteEngine on
+RewriteCond %{HTTP_HOST} ^([a-zA-Z0-9-.]+)$
+
+# If there is a sub-directory that matches the hostname, then
+# serve pages from that directory
+RewriteCond {{ web_root }}/%1 -d
+RewriteRule ^(.*) {{ web_root }}/%1$1 [L]
+
+# Otherwise, just serve the placeholder page because the service
+# doesn't exist yet
+RewriteRule ^(.*) {{ web_root }}/index.html [L]
+
+# vim: syntax=apache ts=4 sw=4 sts=4 sr noet

roles/apache2/templates/apache.vhost.conf.j2

@@ -1 +1 @@
 <VirtualHost *:80>
         ServerAdmin webmaster@{{ domain_name }}
+{% if domain != '' %}
         ServerName {{ domain }}
+{% endif %}
 {% if domain_alias != '' %}
         ServerAlias {{ domain_alias }}
@@ -14 +16 @@
         AliasMatch "^/(.well-known/acme-challenge/.*)" "/usr/share/certbot/$1"
 
-{% if service_name == 'pages' %}
+{% if service_name == 'default' or service_name == 'pages' %}
         # Special case for static pages; don't use HTTPS due to having no certificates for user sites
         # So just include the site config here and don't redirect to HTTPS equivilents
@@ -28 +30 @@
         <VirtualHost _default_:443>
                 ServerAdmin webmaster@{{ domain_name }}
+{% if domain != '' %}
                 ServerName {{ domain }}
+{% endif %}
 {% if domain_alias != '' %}
                 ServerAlias {{ domain_alias }}
 {% endif %}
 
-{% if service_name == 'default' %}
-                # Redirect the bare domain name to the service providing the home page
-                Redirect / https://{{ redirect_to_service }}.{{ domain_name }}/
-{% else %}
                 DocumentRoot {{ web_root }}
-{% endif %}
 
                 ErrorLog ${APACHE_LOG_DIR}/{{ service_name }}/error.log

roles/mediawiki/defaults/main.yml

@@ -2 +2 @@
 subdomain: wiki
 domain: "{{ subdomain }}.{{ domain_name }}"
-domain_alias: ""
+# Since we are using the wiki as our homepage, both the bare domain and the
+# www domain should also serve the wiki - set aliases accordingly
+domain_alias: "{{ domain_name }} www.{{ domain_name }}"
 web_root: /var/lib/mediawiki
 

roles/pages/files/repo-specific/pages

@@ -67 +67 @@
 
     pages_dir=$HOME/pages/$GL_REPO
-    log_dir=$HOME/pages-log
-    cname_link=/cnames/$cname
-    cname_log_link=/cnames-log/$cname
+    cname_dir=/var/www/default
 
     # check if file already exists at symlink location
-    if [ -L $cname_link ]; then
+    if [ -L "$cname_dir/$cname" ]; then
         # already exists
         # check if the symlink points the target we want
-        if ! [ "$(readlink $cname_link)" = "$pages_dir" ]; then
+        if ! [ "$(readlink $cname_dir/$cname)" = "$pages_dir" ]; then
             # CNAME already in use
             echo "======================"
@@ -89 +87 @@
         # new CNAME
         # remove any old CNAME symlinks for this repository
-        for file in /cnames/*; do
-            if [ "$(readlink $file)" == $pages_dir ]; then
+        for file in $cname_dir/*; do
+            if [ "$(readlink $file)" = "$pages_dir" ]; then
                 # points to current pages repo
                 rm $file
-                # we shouldn't need to clean up the access log link as if the
-                # root is missing then nginx docs say it won't write to access
-                # log, but lets remove it anyway
-                rm /cnames-log/$(basename $file)
             fi
         done
         # add symlinks for new CNAME
-        ln -s $pages_dir $cname_link
-        ln -f -s $log_dir $cname_log_link
+        ln -s $pages_dir $cname_dir/$cname
     fi
 fi

roles/pages/tasks/main.yml

@@ -13 +13 @@
   with_items:
     - "repo-specific/pages"
-
-# The pages hook needs a user-agnostic place to add symlinks if the
-# user wants to use a custom domain for their site
-- name: Create directories for pages CNAME support
-  file:
-    path: "{{ item }}"
-    state: directory
-    owner: root
-    group: root
-    mode: 0777
-  with_items:
-    - "/cnames"
-    - "/cnames-log"