b43ac205b0
splitting into a multipackage, with a subpackage for the standalone version (which embeds a version of nginx). The standalone version operates much like other ruby webservers, serving a single ruby/rack application. Switch to using the gem version of passenger. Because the gem installs into a versioned directory, setup symlinks to the versioned directory so that nginx configuration files don't need to be modified when the version is updated.
27 lines
1.3 KiB
Plaintext
27 lines
1.3 KiB
Plaintext
$OpenBSD: patch-ext_common_ResourceLocator_h,v 1.3 2011/12/13 18:38:18 jeremy Exp $
|
|
--- ext/common/ResourceLocator.h.orig Wed Dec 31 16:00:00 1969
|
|
+++ ext/common/ResourceLocator.h Thu Dec 1 09:06:02 2011
|
|
@@ -64,14 +64,14 @@ class ResourceLocator { (public)
|
|
bool nativelyPackaged = !fileExists(root + "/Rakefile") ||
|
|
!fileExists(root + "/DEVELOPERS.TXT");
|
|
|
|
- if (nativelyPackaged) {
|
|
- agentsDir = "/usr/lib/phusion-passenger/agents";
|
|
- helperScriptsDir = "/usr/share/phusion-passenger/helper-scripts";
|
|
- resourcesDir = "/usr/share/phusion-passenger";
|
|
- docDir = "/usr/share/doc/phusion-passenger";
|
|
- rubyLibDir = "";
|
|
- compilableSourceDir = "/usr/share/phusion-passenger/compilable-source";
|
|
- apache2Module = "/usr/lib/apache2/modules/mod_passenger.so";
|
|
+ if (0) {
|
|
+ agentsDir = "${PASSENGER_ROOT}/agents";
|
|
+ helperScriptsDir = "${PASSENGER_ROOT}/helper-scripts";
|
|
+ resourcesDir = "${PASSENGER_ROOT}/resources";
|
|
+ docDir = "${PASSENGER_ROOT}/doc";
|
|
+ rubyLibDir = "${PASSENGER_ROOT}/lib";
|
|
+ compilableSourceDir = "${PASSENGER_ROOT}";
|
|
+ apache2Module = "${LOCALBASE}/lib/apache2/modules/mod_passenger.so";
|
|
} else {
|
|
agentsDir = root + "/agents";
|
|
helperScriptsDir = root + "/helper-scripts";
|