diff options
| author | ChrisTX <xpipe@hotmail.de> | 2012-09-23 12:30:30 +0200 |
|---|---|---|
| committer | attilamolnar <attilamolnar@hush.com> | 2012-10-04 15:14:04 +0200 |
| commit | c2f7fc047c2e5bbb899c820590ce07fee593b28f (patch) | |
| tree | dca97896004c71a484d6dd189e78e40732a5f041 /make | |
| parent | 6f5414e1bf63228471e078f29a5889f44e598a8c (diff) | |
Replace hardcoded paths with configurable ones
This patchset aims to ease the packaging of InspIRCd for a system-wide installation scenario.
Changes in detail:
configure: Add the options --log-path and --data-path
m_ssl_gnutls, openssl: Change the hardcoded "conf/" to the existent CONFIG_PATH macro
m_xline_db: Make the location of xline.db configurable. It will use --data-path as default value, but this can be
changed using the configuration files.
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.pm | 4 | ||||
| -rw-r--r-- | make/template/inspircd | 4 | ||||
| -rw-r--r-- | make/template/main.mk | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/make/configure.pm b/make/configure.pm index 253738b2d..b8e39598a 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -281,6 +281,10 @@ InspIRCd 1.0.x, are also allowed. [$PWD] --config-dir=[directory] Config file directory for config and SSL certs [$PWD/conf] + --log-dir=[directory] Log file directory for logs + [$PWD/logs] + --data-dir=[directory] Data directory for variable data, such as the permchannel configuration and the XLine database + [$PWD/data] --module-dir=[directory] Modules directory for loadable modules [$PWD/modules] --binary-dir=[directory] Binaries directory for core binary diff --git a/make/template/inspircd b/make/template/inspircd index a75140c5d..88eb7ee6a 100644 --- a/make/template/inspircd +++ b/make/template/inspircd @@ -26,7 +26,7 @@ use Fcntl; my $basepath = "@BASE_DIR@"; my $confpath = "@CONFIG_DIR@/"; my $binpath = "@BINARY_DIR@"; -my $runpath = "@BASE_DIR@"; +my $runpath = "@DATA_DIR@"; my $valgrindlogpath = "$basepath/valgrindlogs"; my $executable = "@EXECUTABLE@"; my $version = "@VERSION@"; @@ -382,7 +382,7 @@ sub getpidfile } # End of includes / No includes found. Using default. - $pidfile = $runpath . "/data/inspircd.pid"; + $pidfile = $runpath . "/inspircd.pid"; } sub getstatus { diff --git a/make/template/main.mk b/make/template/main.mk index 3d7b8a694..d4e8de287 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -42,6 +42,7 @@ PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) BASE = "$(DESTDIR)@BASE_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" +DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" INSTUID = @UID@ INSTMODE_DIR = 0755 @@ -236,6 +237,7 @@ install: target @echo ' Configuration:' $(CONPATH) @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) + @echo ' Data:' $(DATPATH) @echo 'To start the ircd, run:' $(BASE)/inspircd start @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ |