summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-06-25 20:27:32 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2014-06-25 23:35:42 +0300
commit215f94b00c3540dc60f3b498e4fdf7094f30324b (patch)
tree410fabfd2cdd80867edc7d7dc6be597ff8fc97c5
parentbdfd467ef1ea44d40d994c1d6edb090421aca774 (diff)
downloadaconf-215f94b00c3540dc60f3b498e4fdf7094f30324b.tar.bz2
aconf-215f94b00c3540dc60f3b498e4fdf7094f30324b.tar.xz
aconf-specific Augeas lenses
-rw-r--r--Makefile3
-rwxr-xr-xrun-server.sh2
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index feb0c3e..8598224 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ LUA_VERSION := 5.2
confdir := etc/aconf
luadir := usr/share/lua/$(LUA_VERSION)/aconf
resdir := usr/share/aconf
+augdir := $(resdir)/augeas
webdir := $(resdir)/web
starter := usr/sbin/aconfd
@@ -43,6 +44,8 @@ endef
$(eval $(call link,aconf,$(luadir)))
$(eval $(call rcopy,aconf,$(luadir),lua,-not -path 'aconf/modules/demo-*'))
+$(eval $(call rcopy,augeas,$(augdir),aug))
+
$(eval $(call link,config,$(confdir)))
$(eval $(call copy,config,$(confdir),audit.json,600))
$(eval $(call copy,config,$(confdir),auth.json,600))
diff --git a/run-server.sh b/run-server.sh
index 0e127fa..ad67263 100755
--- a/run-server.sh
+++ b/run-server.sh
@@ -3,6 +3,8 @@
# Copyright (c) 2012-2014 Kaarle Ritvanen
# See LICENSE file for license details
+export AUGEAS_LENS_LIB=augeas
+
if [ $(basename $0) = run-server.sh ]; then
export LUA_PATH="./?.lua;./?/init.lua;;"
PORT=${1:-8000}