Commit 08e07650 authored by Paul Cammish's avatar Paul Cammish
Browse files

Improve CI performance, fixes #323, other small fixes

parent 8f3dfa94
sympl-web (11.20220406.0) stable; urgency=low
* Use 'awffull' config file names rather than 'webalizer' for stats.
-- Paul Cammish <sympl@kelduum.net> Wed, 06 Apr 2022 12:48:00 +0100
sympl-web (11.20220322.1) stable; urgency=low
* Update references from sympl.host to sympl.io
-- Paul Cammish <sympl@kelduum.net> Tue, 22 Mar 2022 14:00:00 +0000
sympl-web (11.20210818.1) stable; urgency=medium
* Debian Bullseye Release
......
......@@ -23,7 +23,7 @@ module Symbiosis
end
#
# This method returns the location of the Webalizer "history" file, used
# This method returns the location of the AWFFull "history" file, used
# to keep the last 12 months-worth of stats, for use in the HistoryName
# directive.
#
......@@ -37,17 +37,17 @@ module Symbiosis
#
# This is the old place.
#
old_location = File.join(domain.stats_dir, "webalizer.hist")
old_location = File.join(domain.stats_dir, "awffull.hist")
return old_location if File.exist?(old_location)
#
# OK, just use the new one.
#
return File.join(domain.config_dir, ".webalizer.hist")
return File.join(domain.config_dir, ".awffull.hist")
end
#
# This method returns the location of the Webalizer "current" file, used
# This method returns the location of the AWFFull "current" file, used
# for incremental stats, for use in the IncrementalName directive.
#
# Older machines will have it at public/htdocs/stats/webalizer.current,
......@@ -60,13 +60,13 @@ module Symbiosis
#
# This is the old place.
#
old_location = File.join(domain.stats_dir, "webalizer.current")
old_location = File.join(domain.stats_dir, "awffull.current")
return old_location if File.exist?(old_location)
#
# OK, just use the new one.
#
return File.join(domain.config_dir, ".webalizer.current")
return File.join(domain.config_dir, ".awffull.current")
end
end
......
......@@ -13,7 +13,7 @@
# OPTIONS
#
# -t, --template <file> Set the awffull config template file. Defaults to
# /etc/sympl/apache.d/webalizer.conf.erb.
# /etc/sympl/apache.d/awffull.conf.erb.
#
# -f, --force Force regeneration of the awffull configuration
# snippet for all domains.
......@@ -49,7 +49,7 @@ require 'getoptlong'
#
# The options set by the command line.
#
template = '/etc/sympl/apache.d/webalizer.conf.erb'
template = '/etc/sympl/apache.d/awffull.conf.erb'
help = false
manual = false
$VERBOSELOCAL = false
......@@ -159,7 +159,7 @@ Symbiosis::Domains.each(prefix) do |domain|
#
# Create a configuration file, if one wasn't found.
#
webalizer_conf = File.join( domain.config_dir, "webalizer.conf" )
webalizer_conf = File.join( domain.config_dir, "awffull.conf" )
config = Symbiosis::ConfigFiles::Webalizer.new(webalizer_conf, "#")
config.template = template
......@@ -232,7 +232,7 @@ Symbiosis::Domains.each(prefix) do |domain|
# Read webalizer config to find where the history file is kept, so we can see when
#
output_dir = domain.config_dir
history_name = "webalizer.hist"
history_name = "awffull.hist"
File.open(config.filename) do |fh|
while line = fh.gets
......
......@@ -20,11 +20,11 @@
Upload a file named <b>index.html</b> or <b>index.php</b><br>
to your domain's <b>htdocs</b> directory this page will disappear.</p>
<p>Full instructions and guides can be found at <a href="https://wiki.sympl.host"><b>https://wiki.sympl.host</b></a>.</p>
<p>Full instructions and guides can be found at <a href="https://wiki.sympl.io"><b>https://wiki.sympl.io</b></a>.</p>
</div>
<div class="logo" style="float: left; right: 0; bottom: 0; margin-top: 0px;">
<a href="http://sympl.host" style="color: #336699"><img title="This web server runs Sympl" alt="Sympl" height="28" width="124" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPgAAAA4CAYAAADQOTW/AAAEJ0lEQVR4Xu2cQXLjMAwElR/mqfnhbm3txZGr1J6ANEGlcyUMAo0ZUXJsfxz+SUACtyXwcdvObEwCEjg0uCKQwI0JaPAbD9fWJDDc4F9fX38esX5+fg7fw7FJQAKvERhuPg3+GnijJPAOAhr8HZTdQwKLCGjwReDdVgLvIBAb/HwLXi3SZ/QqQV8PBL69J/QCrdgTL+RcFhI3o8GXzcqNf0ZAgyfcNHhCy9gGBDR4MgQNntAytgEBDX41BDL0+Rma/k2W5msgEEu4FwEyfPzY2hkPNpMaUoN3Hre1HcehwR9loME1xc0IaHANfjNJ284jAQ0+0+ANtEYDTks8P+ZQfnwsOhWQ5qP4tD+Kp35m10P7n+unetJ8xGfpOjYz+hZ9abf/N6cBpyVq8Gtio3mfd0MNFy+YqR5axSMcDY7z0uAaHEWyKkCD18lrcA1eV9GkDL/B4HSLiAxC9qP3S/PtHk+40/58Br8ieoNb9KogSHCzBZTWv3s88U77mz0fqnfpOp5eGjyeT1WAVUGm+3eLJ+BpvVWeVE/rdQ1+DP/hyaoAq4JM9+8WT4ZJ663ypHpar6PBz9XTiZ52+4bvg5MgziXHTE4JaL80f5pv93iSUNqfBieij+saHGlVBVgVZLp/t3gCnNZb5Un1tF5PT5NDg+M8qwKsCjLdv1s8AU7rrfKkelqva/Dn8cRMvEX/RqDb5wI0+MhL0AZfF6UTgHDQBYDy0+urgkz37xZP/NN6qzypntbrqdiwGQ2On3VPmaeC3j2eNJb2p8GJaLKuwTV4s0cWDZ4YmGI1uAbX4OSS963j7SK9a37D32SjW8DzdLq9qUT1V+udnZ/Un+7vCX5FVIOT3p4+CVcVYFWQ6f7d4gl4Wm+VJ9XTet0T/Hk8JCBP8GtJV+8QyDA0H9J09fVUX6t1goEfbPEW3RP8pGgN3sjiGpyHkV7x03iqIM23e/xoHt6i+wx+qanZhhkt6Nn1zs4/mocG1+Aa/IJA9ZY7vSBocCIQrHuLzrBSgabxVEGab/f40Tw8wYno4zr92yzJ9S+24ffBqQW8KJ4SkOFoP1p/9wlL/aT1UH+0TvOgeqv56fVL1wnOU3EaPP4FmKrASCCpobrFU3+0Thqu8qf8VN/S9bh4Da7BQbHpBaRqANKwBk8Ia3ANrsETx6yNpatfXB192SRO6AvoBBo+w8HId6//G47RB1zKOn3Parg4NHg6Mozf3SC716/BHwlocDRsGrC7QXavX4Nr8NSzUfzuBtm9fg0eyfX3BZPAUyLDH6vSAsJ46n+3fsL214YLdz5/EnhawW4zo/536yed19J44c7HTwJPK9htZtT/bv2k81oaL9z5+EngaQW7zYz6362fdF5L44W7FL+bS2AuAQ0+l6/ZJbCUgAZfit/NJTCXgAafy9fsElhK4C8AOVBXH4wkxwAAAABJRU5ErkJggg=="></a>
<a href="http://sympl.io" style="color: #336699"><img title="This web server runs Sympl" alt="Sympl" height="28" width="124" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAPgAAAA4CAYAAADQOTW/AAAEJ0lEQVR4Xu2cQXLjMAwElR/mqfnhbm3txZGr1J6ANEGlcyUMAo0ZUXJsfxz+SUACtyXwcdvObEwCEjg0uCKQwI0JaPAbD9fWJDDc4F9fX38esX5+fg7fw7FJQAKvERhuPg3+GnijJPAOAhr8HZTdQwKLCGjwReDdVgLvIBAb/HwLXi3SZ/QqQV8PBL69J/QCrdgTL+RcFhI3o8GXzcqNf0ZAgyfcNHhCy9gGBDR4MgQNntAytgEBDX41BDL0+Rma/k2W5msgEEu4FwEyfPzY2hkPNpMaUoN3Hre1HcehwR9loME1xc0IaHANfjNJ284jAQ0+0+ANtEYDTks8P+ZQfnwsOhWQ5qP4tD+Kp35m10P7n+unetJ8xGfpOjYz+hZ9abf/N6cBpyVq8Gtio3mfd0MNFy+YqR5axSMcDY7z0uAaHEWyKkCD18lrcA1eV9GkDL/B4HSLiAxC9qP3S/PtHk+40/58Br8ieoNb9KogSHCzBZTWv3s88U77mz0fqnfpOp5eGjyeT1WAVUGm+3eLJ+BpvVWeVE/rdQ1+DP/hyaoAq4JM9+8WT4ZJ663ypHpar6PBz9XTiZ52+4bvg5MgziXHTE4JaL80f5pv93iSUNqfBieij+saHGlVBVgVZLp/t3gCnNZb5Un1tF5PT5NDg+M8qwKsCjLdv1s8AU7rrfKkelqva/Dn8cRMvEX/RqDb5wI0+MhL0AZfF6UTgHDQBYDy0+urgkz37xZP/NN6qzypntbrqdiwGQ2On3VPmaeC3j2eNJb2p8GJaLKuwTV4s0cWDZ4YmGI1uAbX4OSS963j7SK9a37D32SjW8DzdLq9qUT1V+udnZ/Un+7vCX5FVIOT3p4+CVcVYFWQ6f7d4gl4Wm+VJ9XTet0T/Hk8JCBP8GtJV+8QyDA0H9J09fVUX6t1goEfbPEW3RP8pGgN3sjiGpyHkV7x03iqIM23e/xoHt6i+wx+qanZhhkt6Nn1zs4/mocG1+Aa/IJA9ZY7vSBocCIQrHuLzrBSgabxVEGab/f40Tw8wYno4zr92yzJ9S+24ffBqQW8KJ4SkOFoP1p/9wlL/aT1UH+0TvOgeqv56fVL1wnOU3EaPP4FmKrASCCpobrFU3+0Thqu8qf8VN/S9bh4Da7BQbHpBaRqANKwBk8Ia3ANrsETx6yNpatfXB192SRO6AvoBBo+w8HId6//G47RB1zKOn3Parg4NHg6Mozf3SC716/BHwlocDRsGrC7QXavX4Nr8NSzUfzuBtm9fg0eyfX3BZPAUyLDH6vSAsJ46n+3fsL214YLdz5/EnhawW4zo/536yed19J44c7HTwJPK9htZtT/bv2k81oaL9z5+EngaQW7zYz6362fdF5L44W7FL+bS2AuAQ0+l6/ZJbCUgAZfit/NJTCXgAafy9fsElhK4C8AOVBXH4wkxwAAAABJRU5ErkJggg=="></a>
</div>
</body>
</html>
\ No newline at end of file
</html>
......@@ -4,6 +4,6 @@
Alias /webmail /var/www/webmail
<Directory /var/www/webmail >
php_admin_value open_basedir /var/www/webmail:/usr/share/roundcube:/var/lib/roundcube/:/usr/share/php:/etc/roundcube/:/var/log/roundcube
php_admin_value open_basedir /var/www/webmail:/usr/share/roundcube:/var/lib/roundcube/:/usr/share/php:/etc/roundcube/:/var/log/roundcube:/usr/share/nodejs/bootstrap:/usr/share/javascript
php_admin_value upload_tmp_dir /var/lib/roundcube/temp
</Directory>
sympl-webmail (11.20220322.0) stable; urgency=medium
* Fix log warnings from Roundcube in user.log
-- Paul Cammish <sympl@kelduum.net> Tue, 22 Mar 2022 13:27:00 +0000
sympl-webmail (11.20210818.1) stable; urgency=medium
* Debian Bullseye Release
......
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