Commit 19dffde0 authored by Paul Cammish's avatar Paul Cammish
Browse files

Replaced references to Bytemark/Symbiosis with Sympl

parent 3d35fa56
......@@ -44,7 +44,7 @@ package:firewall:
<<: *package
package:ftp:
<<: *package
package:httpd:
package:web:
<<: *package
package:monit:
<<: *package
......
......@@ -21,7 +21,7 @@ Recommends: sympl-backup,
sympl-email,
sympl-firewall,
sympl-ftp,
sympl-httpd,
sympl-web,
sympl-monit,
sympl-mysql,
sympl-pam,
......
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Unconfigured domain -- Bytemark Symbiosis</title>
<link href="/bytemark/bytemark.css" media="screen" rel="stylesheet">
</head>
<body>
<div class="logo">
<a href="http://www.bytemark.co.uk"><img src="/bytemark/bytemark.png" alt="Bytemark Hosting" width="271" height="21" /></a>
</div>
<h1 class="header"> Unconfigured Domain </h1>
<div class="body">
<p>The owner of this web site has not uploaded any web pages yet.</p>
<h2>If this is your domain:</h2>
<p>If you upload a file named <span class="tt">index.html</span>, or <span class="tt">index.php</span>, to your domain's root directory this page will go away.</p>
<p>Further instructions may be found in the <a href="http://symbiosis.bytemark.co.uk/jessie/docs/">Symbiosis documentation</a> which is located upon the <a href="http://symbiosis.bytemark.co.uk/">Bytemark Symbiosis website</a>, the following chapters might be particularly useful:</p>
<ul>
<li><a href="http://symbiosis.bytemark.co.uk/jessie/docs/ch-website-setup.html">Website hosting details</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/jessie/docs/ch-ftp-access.html">Uploading your website via FTP</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/jessie/docs/ch-database-hosting.html">Controlling your database</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/jessie/docs/ch-email-server-setup.html">Configuring your email hosting.</a></li>
</ul>
<h2>If you're just visiting:</h2>
<p>Please check back later!</p>
</div>
<address>
&copy; 2019 Bytemark Ltd. All rights reserved.
</address>
</body>
</html>
mod vhost-alias/.libs/mod_vhost_bytemark.so
mod debian/vhost_bytemark.load
sbin usr/
test.d etc/symbiosis/
apache.d etc/symbiosis/
ssl-hooks.d usr/share/symbiosis/
monit.d/* usr/share/symbiosis/monit/checks/
bytemark/* usr/share/symbiosis/static/
bytemark/* etc/symbiosis/skel.d/public/htdocs/
apache2 etc/
php etc/
usr/sbin/symbiosis-httpd-configure etc/cron.hourly/symbiosis-httpd-configure
usr/sbin/symbiosis-httpd-rotate-logs etc/cron.daily/symbiosis-httpd-rotate-logs
usr/share/symbiosis/ssl-hooks.d/symbiosis-httpd etc/symbiosis/ssl-hooks.d/symbiosis-httpd
etc/php/7.0/conf.d/symbiosis-httpd.ini etc/php/7.0/apache2/conf.d/00-symbiosis-httpd.ini
rm_conffile /etc/symbiosis/monit.d/apache2 2017:0424
rm_conffile /etc/symbiosis/ssl-hooks.d/symbiosis-httpd 2017:0907~
LoadModule vhost_bytemark_module /usr/lib/apache2/modules/mod_vhost_bytemark.so
####
##
#
# DO NOT EDIT THIS FILE - CHANGES WILL BE OVERWRITTEN
#
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/ssl.template.erb
#
# If you absolutely MUST make changes, then please apply them to
# the master template file. Then run the following command to
# make them live:
#
# create-ssl-sites --force --verbose
#
##
###
##
#
# For SSL documenation please consult:
#
# http://symbiosis.bytemark.co.uk/docs/ch-ssl-hosting.html
#
##
###
NameVirtualHost <%= ip() %>:443
<VirtualHost <%= ip() %>:443>
SSLEngine On
<%= certificate %>
<%= bundle() %>
SSLOptions +StrictRequire
#
# This is the directory people are redirected to
# if their site is empty.
#
Alias /bytemark/ "/usr/share/symbiosis-static/"
<Directory "/usr/share/symbiosis-static/">
DirectoryIndex index.html
AllowOverride None
</Directory>
#
# Allow users to override settings via .htaccess
#
<Directory "/srv">
AllowOverride all
</Directory>
#
# And this makes that redirection happen.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
</LocationMatch>
#
# The document root
#
DocumentRoot /srv/<%= @domain %>/public/htdocs/
#
# General CGI Handling
#
ScriptAlias /cgi-bin/ /srv/<%= @domain %>/public/cgi-bin/
<Location /cgi-bin>
Options +ExecCGI
</Location>
#
# We need to log the virtual hostname the incoming request was
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog /var/log/apache2/<%= @domain %>.ssl.error.log
CustomLog /var/log/apache2/<%= @domain %>.ssl.access.log combined
</VirtualHost>
NameVirtualHost <%= ip() %>:80
<VirtualHost <%= ip() %>:80>
<% if mandatory_ssl? %>
#
# All accesses redirect to the HTTPS version of
# the site.
#
Redirect / https://<%= @domain %>/
<% else %>
#
# This is the directory people are redirected to
# if their site is empty.
#
Alias /bytemark/ "/usr/share/symbiosis-static/"
<Directory "/usr/share/symbiosis-static/">
DirectoryIndex index.html
AllowOverride None
</Directory>
#
# Allow users to override settings via .htaccess
#
<Directory "/srv">
AllowOverride all
</Directory>
#
# And this makes that redirection happen.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
</LocationMatch>
#
# The document root
#
DocumentRoot /srv/<%= @domain %>/public/htdocs/
#
# General CGI Handling
#
ScriptAlias /cgi-bin/ /srv/<%= @domain %>/public/cgi-bin/
<Location /cgi-bin>
Options +ExecCGI
</Location>
#
# We need to log the virtual hostname the incoming request was
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog /var/log/apache2/<%= @domain %>.error.log
CustomLog /var/log/apache2/<%= @domain %>.access.log combined
<% end %>
</VirtualHost>
......@@ -7,9 +7,9 @@ RUBYLIB := "${PWD}/lib:${PWD}/../common/lib"
#
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -q DEB_BUILD_GNU_TYPE)
all: sbin/symbiosis-httpd-logger docs
all: sbin/sympl-web-logger docs
docs: man/symbiosis-httpd-configure.man man/symbiosis-httpd-generate-stats.man man/symbiosis-httpd-rotate-logs.man man/symbiosis-httpd-logger.man
docs: man/sympl-web-configure.man man/sympl-web-generate-stats.man man/sympl-web-rotate-logs.man man/sympl-web-logger.man
#
# The dh-golang stuff seems to put the binary in obj-$DEB_BUILD_GNU_TYPE/bin
......@@ -19,11 +19,11 @@ obj-$(DEB_BUILD_GNU_TYPE)/bin/%: %.go
go build -o $@ $<
test: obj-$(DEB_BUILD_GNU_TYPE)/bin/symbiosis-httpd-logger
test: obj-$(DEB_BUILD_GNU_TYPE)/bin/sympl-web-logger
$(MAKE) -C vhost-alias test
RUBYLIB=${RUBYLIB} ruby test.d/t*.rb
sbin/symbiosis-httpd-logger: obj-$(DEB_BUILD_GNU_TYPE)/bin/symbiosis-httpd-logger
sbin/sympl-web-logger: obj-$(DEB_BUILD_GNU_TYPE)/bin/sympl-web-logger
cp -a $< $@
man/%.txt: ./txt/%.txt
......@@ -46,6 +46,6 @@ clean:
@find . -name 'configure-stamp' -exec rm \{\} \;
@find . -name 'build-stamp' -exec rm \{\} \;
$(RM) -r man
$(RM) sbin/symbiosis-httpd-logger
$(RM) sbin/sympl-web-logger
.PHONY: test clean all docs
mod_vhost_bytemark
------------------
mod_vhost_sympl
---------------
This is a minimaly modified copy of mod_vhost_alias from the
Apache 2.x source tree.
......
......@@ -2,10 +2,10 @@
##
#
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/non_ssl.template.erb.
# /etc/sympl/apache.d/non_ssl.template.erb.
#
# Feel free to make changes to this file. If changes are made, then this file
# will not be updated automatically when the template changes.
# Feel free to make changes to this file. However, If changes are made,
# then this file will NOT be updated automatically when the template changes.
#
##
###
......@@ -31,8 +31,8 @@
# This is the directory people are redirected to if their site is
# empty.
#
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
Alias /__sympl/ "/usr/share/sympl/static/"
<Directory "/usr/share/sympl/static/">
DirectoryIndex index.html
AllowOverride All
Require all granted
......@@ -43,7 +43,7 @@
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
ErrorDocument 403 /__sympl/index.html
</LocationMatch>
#
......@@ -93,7 +93,7 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/access.log" combined
ErrorLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/access.log" combined
</VirtualHost>
......@@ -2,15 +2,11 @@
##
#
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/ssl.template.erb.
# /etc/sympl/apache.d/ssl.template.erb.
#
# Feel free to make changes to this file, and thereafter it will not be
# Feel free to make changes to this file, however it will NOT be
# automatically updated if the template, or SSL configuration changes.
#
# For SSL documenation please consult:
#
# http://symbiosis.bytemark.co.uk/jessie/docs/ch-ssl-hosting.html
#
##
###
......@@ -35,8 +31,8 @@
# This is the directory people are redirected to if their site is
# empty.
#
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
Alias /__sympl/ "/usr/share/sympl/static/"
<Directory "/usr/share/sympl/static/">
DirectoryIndex index.html
AllowOverride All
Require all granted
......@@ -47,40 +43,41 @@
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
ErrorDocument 403 /__sympl/
</LocationMatch>
<IfModule ssl_module>
SSLEngine On
#
# The certificate, key, and intermediate bundle (if needed)
#
<%= ssl_config %>
SSLEngine On
#
# Intermediate configuration, taken from
# https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=apache-2.4.10&openssl=1.0.1k&hsts=yes&profile=intermediate
#
SSLProtocol all -SSLv3
SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
#
# The certificate, key, and intermediate bundle (if needed)
#
<%= ssl_config %>
SSLHonorCipherOrder on
SSLCompression off
#
# Intermediate configuration, taken from
# https://mozilla.github.io/server-side-tls/ssl-config-generator/?server=apache-2.4.10&openssl=1.0.1k&hsts=yes&profile=intermediate
#
SSLProtocol all -SSLv3
SSLCipherSuite ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS
#
# OCSP Stapling -- make sure you remove the reject-www-data
# rule from the outgoing firewall if you use this.
#
SSLUseStapling off
SSLStaplingResponderTimeout 5
SSLStaplingReturnResponderErrors off
SSLHonorCipherOrder on
SSLCompression off
#
# OCSP Stapling -- make sure you remove the reject-www-data
# rule from the outgoing firewall if you use this.
#
SSLUseStapling off
SSLStaplingResponderTimeout 5
SSLStaplingReturnResponderErrors off
% if mandatory_ssl?
<IfModule headers_module>
# HSTS (mod_headers is required) (15768000 seconds = 6 months)
Header always set Strict-Transport-Security "max-age=15768000"
</IfModule>
<IfModule headers_module>
# HSTS (mod_headers is required) (15768000 seconds = 6 months)
Header always set Strict-Transport-Security "max-age=15768000"
</IfModule>
% end
</IfModule>
......@@ -131,8 +128,8 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/ssl_error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/ssl_access.log" combined
ErrorLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/ssl_error.log"
CustomLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/ssl_access.log" combined
</VirtualHost>
<VirtualHost <%= ips.collect{|ip| ip+":80"}.join(" ") %>>
......@@ -156,8 +153,8 @@
# This is the directory people are redirected to if their site is
# empty.
#
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
Alias /__sympl/ "/usr/share/sympl/static/"
<Directory "/usr/share/sympl/static/">
DirectoryIndex index.html
AllowOverride All
Require all granted
......@@ -168,7 +165,7 @@
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
ErrorDocument 403 /__sympl/
</LocationMatch>
% if mandatory_ssl?
......@@ -244,8 +241,8 @@
# made against, so that the cron-job in /etc/cron.daily may generate
# statistics for each domain.
#
ErrorLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/symbiosis-httpd-logger <%= domain.log_dir %>/access.log" combined
ErrorLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/error.log"
CustomLog "|| /usr/sbin/sympl-web-logger <%= domain.log_dir %>/access.log" combined
% end
</VirtualHost>
......
......@@ -2,7 +2,7 @@
##
#
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/webalizer.conf.erb
# /etc/sympl/apache.d/webalizer.conf.erb
#
# Feel free to make changes to this file. If changes are made, then this file
# will not be updated automatically when the template changes.
......
......@@ -2,7 +2,7 @@
##
#
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/zz-mass-hosting.ssl.template.erb.
# /etc/sympl/apache.d/zz-mass-hosting.ssl.template.erb.
#
# Feel free to make changes to this file. If changes are made, then this file
# will not be updated automatically when the template changes.
......@@ -55,8 +55,8 @@
# This is the directory people are redirected to if their site is
# empty.
#
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
Alias /__sympl/ "/usr/share/sympl/static/"
<Directory "/usr/share/sympl/static/">
DirectoryIndex index.html
AllowOverride All
Require all granted
......@@ -67,7 +67,7 @@
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
ErrorDocument 403 /__sympl/
</LocationMatch>
#
......@@ -99,7 +99,7 @@
RewriteRule ^/(.*)$ /srv/%1/public/htdocs/$1
</IfModule>
<IfModule vhost_bytemark_module>
<IfModule vhost_sympl_module>
#
# We need a wildcard server alias, so Apache knows to check
# where when names don't match elsewhere.
......@@ -133,7 +133,7 @@
# statistics for each domain.
#
LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -l ssl_access.log ${APACHE_LOG_DIR}/zz-mass-hosting.ssl_access.log" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/sympl-web-logger -l ssl_access.log ${APACHE_LOG_DIR}/zz-mass-hosting.ssl_access.log" zz_mass_hosting_combined
ErrorLog ${APACHE_LOG_DIR}/zz-mass-hosting.error.log
</VirtualHost>
####
##
# This file is automatically generated from the template located at
# /etc/symbiosis/apache.d/zz-mass-hosting.template.erb.
# /etc/sympl/apache.d/zz-mass-hosting.template.erb.
#
# Feel free to make changes to this file. If changes are made, then this file
# will not be updated automatically when the template changes.
......@@ -23,8 +23,8 @@
# This is the directory people are redirected to
# if their site is empty.
#
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
Alias /__sympl/ "/usr/share/sympl/static/"
<Directory "/usr/share/sympl/static/">
DirectoryIndex index.html index.php
AllowOverride All
Require all granted
......@@ -35,7 +35,7 @@
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
ErrorDocument 403 /__sympl/
</LocationMatch>
#
......@@ -75,7 +75,7 @@
</IfDefine>
</IfModule>
<IfModule vhost_bytemark_module>
<IfModule vhost_sympl_module>
#
# We need a wildcard server alias, so Apache knows to check
# where when names don't match elsewhere.
......@@ -108,7 +108,7 @@
# statistics for each domain.
#
LogFormat "%V %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\"" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/symbiosis-httpd-logger -l access.log ${APACHE_LOG_DIR}/zz-mass-hosting.access.log" zz_mass_hosting_combined
CustomLog "|| /usr/sbin/sympl-web-logger -l access.log ${APACHE_LOG_DIR}/zz-mass-hosting.access.log" zz_mass_hosting_combined
ErrorLog ${APACHE_LOG_DIR}/zz-mass-hosting.error.log
</VirtualHost>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment