diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
| commit | 23201220bf8b7b63da44747be142face0c98eb09 (patch) | |
| tree | c1645f62976281a552963b1309307e0d0b6136f3 /templates/site.conf | |
| parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
| parent | eaa092eb1a8f3ae19551e6e80f84d174211b5208 (diff) | |
Merge branch 'merge_immerda' into 'master'
This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:
https://labs.riseup.net/code/issues/4132
Diffstat (limited to 'templates/site.conf')
| -rw-r--r-- | templates/site.conf | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/templates/site.conf b/templates/site.conf deleted file mode 100644 index 52ddb53..0000000 --- a/templates/site.conf +++ /dev/null @@ -1,9 +0,0 @@ -<VirtualHost *> - ServerName <%= name %> - DocumentRoot /var/cache/munin/www/ - <Location /> - order allow,deny - Allow from all - </Location> -</VirtualHost> - |