diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-21 13:10:21 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-08-21 13:10:21 +0000 |
| commit | 0a50fcbf3995ed3b777d579b957bd652a5884b0e (patch) | |
| tree | 3fcadfba5ddc9b08b6c5d685952e5a5712ac7ba3 /usr.sbin/httpd/Makefile.tmpl | |
| parent | 8d57b5ec76a164dbed4b00d95975a76997c7ad3b (diff) | |
merge
Diffstat (limited to 'usr.sbin/httpd/Makefile.tmpl')
| -rw-r--r-- | usr.sbin/httpd/Makefile.tmpl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/httpd/Makefile.tmpl b/usr.sbin/httpd/Makefile.tmpl index e696df7d5ac..dd8cbbb2b9c 100644 --- a/usr.sbin/httpd/Makefile.tmpl +++ b/usr.sbin/httpd/Makefile.tmpl @@ -1,7 +1,7 @@ ## ==================================================================== ## The Apache Software License, Version 1.1 ## -## Copyright (c) 2000-2002 The Apache Software Foundation. All rights +## Copyright (c) 2000-2003 The Apache Software Foundation. All rights ## reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -612,10 +612,12 @@ install-config: -e "s;logs/referer_log;$(logfiledir)/$${target_prefix}referer_log;" \ -e "s;logs/agent_log;$(logfiledir)/$${target_prefix}agent_log;" \ -e 's;conf/magic;$(sysconfdir)/magic;' \ + -e 's;conf/srm.conf;$(sysconfdir)/srm.conf;' \ + -e 's;conf/access.conf;$(sysconfdir)/access.conf;' \ -e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \ -e 's;User nobody;User $(conf_user);' \ -e 's;Group #-1;Group $(conf_group);' \ - -e 's;Group "#-1";Group $(conf_group);' \ + -e 's;^Group "#-1";Group $(conf_group);' \ -e 's;Port 80;Port $(conf_port);' \ -e 's;Listen 80;Listen $(conf_port);' \ -e 's;Listen 443;Listen $(conf_port_ssl);' \ |