View | Details | Raw Unified | Return to bug 16690
Collapse All | Expand All

(-)a/debian/templates/koha-conf-site.xml.in (-1 / +1 lines)
Lines 253-259 __END_SRU_PUBLICSERVER__ Link Here
253
 <!-- basic installs have the DB on the same machine,
253
 <!-- basic installs have the DB on the same machine,
254
      if not, tweak these next two entries -->
254
      if not, tweak these next two entries -->
255
 <hostname>__DB_HOST__</hostname>
255
 <hostname>__DB_HOST__</hostname>
256
 <webserver>__DB_HOST__</webserver>
256
 <webserver>__WEBSERVER_HOST__</webserver>
257
 <port>3306</port>
257
 <port>3306</port>
258
 <user>__DB_USER__</user>
258
 <user>__DB_USER__</user>
259
 <pass>__DB_PASS__</pass>
259
 <pass>__DB_PASS__</pass>
(-)a/etc/koha-conf.xml (-1 / +1 lines)
Lines 81-87 __PAZPAR2_TOGGLE_XML_POST__ Link Here
81
<!-- basic installs have the DB on the same machine,
81
<!-- basic installs have the DB on the same machine,
82
     if not, tweak these next two entries -->
82
     if not, tweak these next two entries -->
83
 <hostname>__DB_HOST__</hostname>
83
 <hostname>__DB_HOST__</hostname>
84
 <webserver>__DB_HOST__</webserver>
84
 <webserver>__WEBSERVER_HOST__</webserver>
85
 <port>__DB_PORT__</port>
85
 <port>__DB_PORT__</port>
86
 <user>__DB_USER__</user>
86
 <user>__DB_USER__</user>
87
 <pass>__DB_PASS__</pass>
87
 <pass>__DB_PASS__</pass>
(-)a/rewrite-config.PL (-4 / +5 lines)
Lines 49-61 WEBSERVER_HOST, WEBSERVER_IP, WEBSERVER_PORT, WEBSERVER_PORT_LIBRARIAN, ZEBRA_PA Link Here
49
49
50
=head1 EXAMPLES
50
=head1 EXAMPLES
51
51
52
To override the guessed hostname and email address, run:
52
To override the guessed hostnames and email address, run:
53
53
54
    DB_HOST=mysecrethostname.com.invalid \
54
	WEBSERVER_HOST=mysecrethostname.com.invalid \
55
	WEBSERVER_HOST=mysecrethostname.com.invalid \
55
	WEBMASTER_EMAIL=webmaster@publichost.com make install
56
	WEBMASTER_EMAIL=webmaster@publichost.com make install
56
57
57
Note that if WEBSERVER_HOST does not resolve to an IP address, you will
58
Note that if WEBSERVER_HOST does not resolve to an IP address, you will
58
also need to override WEBSERVER_IP.
59
also need to override WEBSERVER_IP. DB_HOST defaults to the WEBSERVER_HOST value.
59
60
60
=cut
61
=cut
61
62
Lines 73-78 unless ( $myip = $ENV{WEBSERVER_IP} ) { Link Here
73
	or die "can't inet_ntoa ($!)";
74
	or die "can't inet_ntoa ($!)";
74
}
75
}
75
76
77
$mydbhost = $ENV{DB_HOST} || $myhost;
76
78
77
$prefix = $ENV{'INSTALL_BASE'} || "/usr";
79
$prefix = $ENV{'INSTALL_BASE'} || "/usr";
78
80
Lines 85-91 $prefix = $ENV{'INSTALL_BASE'} || "/usr"; Link Here
85
  "__PLUGINS_DIR__" => "/var/lib/koha/plugins",
87
  "__PLUGINS_DIR__" => "/var/lib/koha/plugins",
86
  "__DB_TYPE__" => "mysql",
88
  "__DB_TYPE__" => "mysql",
87
  "__DB_NAME__" => "koha",
89
  "__DB_NAME__" => "koha",
88
  "__DB_HOST__" => $myhost,
90
  "__DB_HOST__" => $mydbhost,
89
  "__DB_PORT__" => "3306",
91
  "__DB_PORT__" => "3306",
90
  "__DB_USER__" => "kohaadmin",
92
  "__DB_USER__" => "kohaadmin",
91
  "__DB_PASS__" => "katikoan",
93
  "__DB_PASS__" => "katikoan",
92
- 

Return to bug 16690