diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile.am | 6 | ||||
| -rw-r--r-- | etc/couchdb/Makefile.am | 10 | ||||
| -rw-r--r-- | etc/couchdb/couch.ini.tpl.in | 8 | ||||
| -rw-r--r-- | etc/couchdb/couch_httpd.conf.tpl.in | 8 | ||||
| -rw-r--r-- | etc/default/couchdb.tpl.in | 2 | ||||
| -rw-r--r-- | etc/logrotate.d/couchdb.tpl.in | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/etc/Makefile.am b/etc/Makefile.am index 0126eb30..ec62fd19 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -39,7 +39,7 @@ default/couchdb: default/couchdb.tpl fi \ fi sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \ - -e "s|%pkgconfdir%|$(pkgconfdir)|g" \ + -e "s|%localconfdir%|$(localconfdir)|g" \ -e "s|%sysconfdir%|$(sysconfdir)|" \ -e "s|%localstatedir%|$(localstatedir)|" \ < $< > $@ @@ -55,12 +55,12 @@ init/couchdb: init/couchdb.tpl sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \ -e "s|%bindir%|$(bindir)|" \ -e "s|%sysconfdir%|$(sysconfdir)|" \ - -e "s|%erlangbindir%|$(erlangbindir)|" \ + -e "s|%localerlangbindir%|$(localerlangbindir)|" \ -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \ < $< > $@ logrotate.d/couchdb: logrotate.d/couchdb.tpl - sed -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" < $< > $@ + sed -e "s|%localstatelogdir%|@localstatelogdir@|g" < $< > $@ launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl if test "$(mkdir_p)"; then \ diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index dc849354..d5356ceb 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -17,14 +17,14 @@ CLEANFILES = $(pkgconf_DATA) transform = @program_transform_name@ couchjs_command_name = `echo couchjs | sed '$(transform)'` -couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib +couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib couch.ini: couch.ini.tpl sed -e "s|%bindir%|$(bindir)|g" \ - -e "s|%pkgconfdir%|$(pkgconfdir)|g" \ - -e "s|%pkgdatadir%|$(pkgdatadir)|g" \ - -e "s|%pkgstatelibdir%|$(pkgstatelibdir)|g" \ - -e "s|%pkgstatelogdir%|$(pkgstatelogdir)|g" \ + -e "s|%localconfdir%|$(localconfdir)|g" \ + -e "s|%localdatadir%|$(localdatadir)|g" \ + -e "s|%localstatelibdir%|$(localstatelibdir)|g" \ + -e "s|%localstatelogdir%|$(localstatelogdir)|g" \ -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \ -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \ < $< > $@ diff --git a/etc/couchdb/couch.ini.tpl.in b/etc/couchdb/couch.ini.tpl.in index 555ea3da..7e155fab 100644 --- a/etc/couchdb/couch.ini.tpl.in +++ b/etc/couchdb/couch.ini.tpl.in @@ -4,15 +4,15 @@ ConsoleStartupMsg=Apache CouchDB is starting. -DbRootDir=%pkgstatelibdir% +DbRootDir=%localstatelibdir% Port=5984 BindAddress=127.0.0.1 -DocumentRoot=%pkgdatadir%/www +DocumentRoot=%localdatadir%/www -LogFile=%pkgstatelogdir%/couch.log +LogFile=%localstatelogdir%/couch.log UtilDriverDir=%couchprivlibdir% @@ -20,4 +20,4 @@ LogLevel=info [Couch Query Servers] -javascript=%bindir%/%couchjs_command_name% %pkgdatadir%/server/main.js +javascript=%bindir%/%couchjs_command_name% %localdatadir%/server/main.js diff --git a/etc/couchdb/couch_httpd.conf.tpl.in b/etc/couchdb/couch_httpd.conf.tpl.in index e4d27493..19d6d10c 100644 --- a/etc/couchdb/couch_httpd.conf.tpl.in +++ b/etc/couchdb/couch_httpd.conf.tpl.in @@ -5,7 +5,7 @@ Port 5984 ServerName localhost SocketType ip_comm Modules mod_couch mod_get mod_log -ServerRoot %pkgconfdir% -DocumentRoot %pkgdatadir%/www -ErrorLog %pkgstatelogdir%/http_error.log -TransferLog %pkgstatelogdir%/http_access.log +ServerRoot %localconfdir% +DocumentRoot %localdatadir%/www +ErrorLog %localstatelogdir%/http_error.log +TransferLog %localstatelogdir%/http_access.log diff --git a/etc/default/couchdb.tpl.in b/etc/default/couchdb.tpl.in index fadef1a7..40c7b6e5 100644 --- a/etc/default/couchdb.tpl.in +++ b/etc/default/couchdb.tpl.in @@ -3,7 +3,7 @@ # Sourced by init script for configuration. COUCHDB_USER=couchdb -COUCHDB_INI_FILE=%pkgconfdir%/couch.ini +COUCHDB_INI_FILE=%localconfdir%/couch.ini COUCHDB_PID_FILE=%localstatedir%/run/couchdb.pid COUCHDB_STDOUT_FILE=/dev/null COUCHDB_STDERR_FILE=/dev/null diff --git a/etc/logrotate.d/couchdb.tpl.in b/etc/logrotate.d/couchdb.tpl.in index 9bef5b2f..0bb07e13 100644 --- a/etc/logrotate.d/couchdb.tpl.in +++ b/etc/logrotate.d/couchdb.tpl.in @@ -1,4 +1,4 @@ -%pkgstatelogdir%/*.log { +%localstatelogdir%/*.log { weekly rotate 10 copytruncate |