Skip to content
GitLab
Commit 1c9ccef1 authored by Patrick J Cherry's avatar Patrick J Cherry
Browse files

Merged httpd-static into httpd package 

 * Moved static pages into /usr/share/symbiosis/static
 * Adjusted templates to reflect the above change
 * Removed /bytemark path from individual site templates.
 * Burnt all gifs.
parent ba339493
Hide whitespace changes
Inline Side-by-side
apache/apache.d/non_ssl.template.erb
View file @ 1c9ccef1
......@@ -26,16 +26,6 @@ NameVirtualHost <%= ip %>:80
#
ServerAlias www.<%= domain %>
#
# 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
#
......@@ -43,14 +33,6 @@ NameVirtualHost <%= ip %>:80
AllowOverride all
</Directory>
#
# And this makes that redirection happen.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
</LocationMatch>
#
# The document root
#
......
apache/apache.d/ssl.template.erb
View file @ 1c9ccef1
......@@ -51,16 +51,6 @@ NameVirtualHost <%= ip %>:80
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
#
......@@ -68,14 +58,6 @@ NameVirtualHost <%= ip %>:80
AllowOverride all
</Directory>
#
# And this makes that redirection happen.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
</LocationMatch>
#
# The document root
#
......@@ -118,15 +100,6 @@ NameVirtualHost <%= ip %>:80
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
......@@ -135,14 +108,6 @@ NameVirtualHost <%= ip %>:80
AllowOverride all
</Directory>
#
# And this makes that redirection happen.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /bytemark/
</LocationMatch>
#
# The document root
#
......
apache/apache.d/zz-mass-hosting.ssl.template.erb
View file @ 1c9ccef1
......@@ -36,9 +36,9 @@ NameVirtualHost <%= ip %>:443
# 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 index.php
Alias /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
DirectoryIndex index.html
AllowOverride All
</Directory>
......
apache/apache.d/zz-mass-hosting.template.erb
View file @ 1c9ccef1
......@@ -19,8 +19,8 @@ NameVirtualHost <%= ip %>:80
# 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 /bytemark/ "/usr/share/symbiosis/static/"
<Directory "/usr/share/symbiosis/static/">
DirectoryIndex index.html index.php
AllowOverride All
</Directory>
......
apache/bytemark/index.html
View file @ 1c9ccef1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Welcome page</title>
<style type="text/css" media="screen">
body { background-color: #666666; margin: 7px 0px 0px; text-align: center; font-family: sans-serif; font-size: 12px }
a img { border: none }
a { color: #336699 }
a:visited, a:link { text-decoration: none; color: #336699 }
a:hover { text-decoration: underline; }
span.tt { font-family: monospace; }
span.bold { font-weight: bold; }
#page { background-color: white; color: black; width: 900px; margin: 0px auto; text-align: left; padding: 0px }
#bytemark_logo{ margin: 15px 0px 0px 62px; padding: 10px 0px }
#header { background-color: #feff01; text-align: center; padding: 10px; color: black }
#body { padding: 10px; margin: 0px 62px; }
#footer { background-color: #336699; color: white; padding: 1px; text-align: right; }
#footer a { color: white }
</style>
</head>
<body>
<div id="page">
<div id="bytemark_logo">
<a href="http://www.bytemark.co.uk"><img
src="/bytemark/logo.gif"
alt="Bytemark Hosting" width="239" height="23" /></a>
</div>
<div id="header">
<h1> Unconfigured Domain </h1>
The owner of this web site has not uploaded any web pages yet.
</div>
<div id="body">
<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/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/docs/ch-website-setup.html">Website hosting details</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/docs/ch-ftp-access.html">Uploading your website via FTP</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/docs/ch-database-hosting.html">Controlling your database</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/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>
<div id="footer">
<p><a href="http://validator.w3.org/check?uri=referer"><img
src="http://www.w3.org/Icons/valid-xhtml10"
alt="Valid XHTML 1.0 Transitional" height="31" width="88" border="0" /></a></p>
</div>
</div>
</body>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Welcome page</title>
<style type="text/css" media="screen">
html { background-color: #666666; margin: 7px 0px 0px; text-align: center; font-family: sans-serif; font-size: 12px }
body { background-color: white; color: black; width: 900px; margin: 0px auto; text-align: left; padding: 0px }
address { background-color: #336699; color: white; padding: 5px; text-align: right; }
a { color: #336699 }
a img { border: none }
a:visited, a:link { text-decoration: none; color: #336699 }
a:hover { text-decoration: underline; }
span.tt { font-family: monospace; }
span.bold { font-weight: bold; }
#bytemark_logo{ margin: 15px 0px 0px 62px; padding: 10px 0px }
#header { background-color: #feff01; text-align: center; padding: 10px; color: black }
#body { padding: 10px; margin: 0px 62px; }
</style>
</head>
<body>
<p id="bytemark_logo">
<a href="http://www.bytemark.co.uk"><img src="/bytemark/logo.png" alt="Bytemark Hosting" width="271" height="21" /></a>
</p>
<div id="header">
<h1> Unconfigured Domain </h1>
<p>The owner of this web site has not uploaded any web pages yet.</p>
</div>
<div id="body">
<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/squeeze/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/squeeze/docs/ch-website-setup.html">Website hosting details</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/squeeze/docs/ch-ftp-access.html">Uploading your website via FTP</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/squeeze/docs/ch-database-hosting.html">Controlling your database</a></li>
<li><a href="http://symbiosis.bytemark.co.uk/squeeze/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>
<a href="http://validator.w3.org/check?uri=referer"><img src="/bytemark/valid-xhtml10.png" alt="Valid XHTML 1.0" height="31" width="88" /></a>
</address>
</body>
</html>
apache/debian/control
View file @ 1c9ccef1
......@@ -22,11 +22,11 @@ Description: A mass-hosting module for Apache 2.x
Package: symbiosis-httpd
Architecture: all
Depends: apache2, php5-mysql, php5-curl, php5-imagick, php5-mcrypt, php5-mhash, php5-xmlrpc, php5-gd, libapache2-mod-php5, webalizer, libapache2-mod-vhost-bytemark, ${misc:Depends}, symbiosis-httpd-static, symbiosis-common (>= 2012:0208), ruby1.8
Replaces: bytemark-vhost-httpd, symbiosis-test, symbiosis-monit (<< 2011:1206)
Replaces: bytemark-vhost-httpd, symbiosis-test, symbiosis-monit (<< 2011:1206), symbiosis-httpd-static
Breaks: symbiosis-test, symbiosis-monit (<< 2011:1206)
Provides: bytemark-vhost-httpd
Conflicts: bytemark-vhost-httpd
Description: Tools to manage Apache virtual hosting
Provides: bytemark-vhost-httpd, symbiosis-httpd-static
Conflicts: bytemark-vhost-httpd, symbiosis-httpd-static
Description: Tools to manage Apache virtual hosting in Symbiosis
This package contains tools to manage the virtual hosting of websites
with Apache2.
.
......@@ -36,11 +36,3 @@ Description: Tools to manage Apache virtual hosting
.
Adding new websites doesn't even require you to restart your server.
Package: symbiosis-httpd-static
Depends: ${misc:Depends}
Architecture: all
Description: Static files
This package contains the static welcome page for the Bytemark Symbiosis
system.
apache/debian/symbiosis-httpd-static.install deleted 100644 → 0
View file @ ba339493
bytemark/index.html usr/share/symbiosis-static/
bytemark/logo.gif usr/share/symbiosis-static/
bytemark/info/index.php usr/share/symbiosis-static/info/
bytemark/info/.htaccess usr/share/symbiosis-static/info/
apache/debian/symbiosis-httpd.install
View file @ 1c9ccef1
......@@ -4,3 +4,4 @@ apache.d etc/symbiosis/
lib/* usr/lib/ruby/1.8/
monit.d/* etc/symbiosis/monit.d/
logrotate.d/* etc/logrotate.d/
bytemark/* usr/share/symbiosis/static/
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