diff options
| -rw-r--r-- | apache/vhosts.m4/cgi+redir.m4 | 16 | ||||
| -rw-r--r-- | apache/vhosts.m4/plain+redir.m4 | 13 | ||||
| -rw-r--r-- | apache/vhosts.m4/redir.m4 | 7 | ||||
| -rw-r--r-- | apache/vhosts.m4/vhost.m4 | 30 |
4 files changed, 30 insertions, 36 deletions
diff --git a/apache/vhosts.m4/cgi+redir.m4 b/apache/vhosts.m4/cgi+redir.m4 deleted file mode 100644 index b7a3d39..0000000 --- a/apache/vhosts.m4/cgi+redir.m4 +++ /dev/null @@ -1,16 +0,0 @@ -<VirtualHost *> - ServerName _HOST -dnl ServerAlias _LOCALHOST - ServerAdmin _EMAIL - DocumentRoot _FILEROOT - ScriptAlias /cgi-bin/ _CGIROOT - user _UID - group _GID -</VirtualHost> -<VirtualHost *> - ServerName _REDIRHOST - ServerAlias *._JOKERHOST - RewriteEngine On - RewriteRule / http://_HOST/ [R] - TransferLog /dev/null -</VirtualHost> diff --git a/apache/vhosts.m4/plain+redir.m4 b/apache/vhosts.m4/plain+redir.m4 deleted file mode 100644 index e27e31c..0000000 --- a/apache/vhosts.m4/plain+redir.m4 +++ /dev/null @@ -1,13 +0,0 @@ -<VirtualHost *> - ServerName _HOST -dnl ServerAlias _LOCALHOST - ServerAdmin _EMAIL - DocumentRoot _FILEROOT -</VirtualHost> -<VirtualHost *> - ServerName _REDIRHOST - ServerAlias *._JOKERHOST - RewriteEngine On - RewriteRule / http://_HOST/ [R] - TransferLog /dev/null -</VirtualHost> diff --git a/apache/vhosts.m4/redir.m4 b/apache/vhosts.m4/redir.m4 deleted file mode 100644 index b9d58ba..0000000 --- a/apache/vhosts.m4/redir.m4 +++ /dev/null @@ -1,7 +0,0 @@ -<VirtualHost *> - ServerName _REDIRHOST - ServerAlias *._JOKERHOST - RewriteEngine On - RewriteRule / http://_HOST/ [R] - TransferLog /dev/null -</VirtualHost> diff --git a/apache/vhosts.m4/vhost.m4 b/apache/vhosts.m4/vhost.m4 new file mode 100644 index 0000000..072388e --- /dev/null +++ b/apache/vhosts.m4/vhost.m4 @@ -0,0 +1,30 @@ +# Generated by vhost.m4 (please delete this line if editing manually!) +ifdef(ROOT, +<VirtualHost VHOST> + ServerName HOST +ifdef(HOST_LOCAL, + ServerAlias HOST_LOCAL +)dnl +ifdef(HOST_JOKER, + ServerAlias HOST_JOKER +)dnl + ServerAdmin EMAIL + DocumentRoot ROOT +ifdef(CGIROOT, + ScriptAlias /cgi-bin/ CGIROOT + user UID + group GID +)dnl +</VirtualHost> +)dnl +ifdef(REDIRHOST, +<VirtualHost VHOST> + ServerName REDIRHOST +ifdef(REDIRHOST_JOKER, + ServerAlias *.REDIRHOST_JOKER +)dnl + RewriteEngine On + RewriteRule / http://HOST/ [R] + TransferLog /dev/null +</VirtualHost> +)dnl |