Add missing auto_install features to new installer

Signed-off-by: Chris Cormack <crc@liblime.com>
liblime · Sep 6, 2007 · 28695e9 · 28695e9
1 parent e449c13
commit 28695e9
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 3,286 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -197,11 +197,10 @@ C4/*.pm is copied to perl's lib namespace.
 =pod
 
 CGIs are copied to koha/cgi-bin
-and other scripts to koha/examples.
+and other scripts to koha/scripts.
 
 =cut
-	# Misc scripts to koha/examples
+	foreach my $src ("mainpage.pl","help.pl",glob("*/*.pl"),glob("installer/*.pm"),glob("*/*/*.pl"),glob("*/*/*/*.pl")) {
-	foreach my $src (glob("*.pl"),glob("*/*.pl"),glob("installer/*.pm"),glob("*/*/*.pl"),glob("*/*/*/*.pl")) {
 		if ($src =~ /(misc|updater|rss)\//) {
 			$result{$src} = '$(INST_LIBDIR)/koha/scripts/'.$src;
 		} else {

diff --git a/etc/koha-httpd.conf b/etc/koha-httpd.conf
@@ -3,8 +3,8 @@
 #NameVirtualHost *
 
 ## OPAC
-<VirtualHost __WEBSERVER_IP__:80>
+<VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT__>
-   ServerAdmin webmaster@__WEBSERVER_DOMAIN__
+   ServerAdmin  __WEBMASTER_EMAIL__
    DocumentRoot __BASE_DIR__/opac/htdocs
    ServerName __WEBSERVER_HOST__
 #  ServerAlias opac.mydomain.com
@@ -33,10 +33,10 @@
 </VirtualHost>
 
 ## Intranet
-<VirtualHost __WEBSERVER_IP__:8080>
+<VirtualHost __WEBSERVER_IP__:__WEBSERVER_PORT_LIBRARIAN__>
-   ServerAdmin webmaster@__WEBSERVER_DOMAIN__
+   ServerAdmin __WEBMASTER_EMAIL__
    DocumentRoot __BASE_DIR__/intranet/htdocs
-   ServerName __WEBSERVER_HOST__:8080
+   ServerName __WEBSERVER_HOST__:__WEBSERVER_PORT_LIBRARIAN__
 #  ServerAlias intranet.mydomain.com
    ScriptAlias /cgi-bin/koha/ "__BASE_DIR__/intranet/cgi-bin/"
    ScriptAlias /index.html "__BASE_DIR__/intranet/cgi-bin/mainpage.pl"