diff --git a/CHANGELOG.md b/CHANGELOG.md index 77adfd5a..23ad263a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,8 @@ * Added -l option for clixon_backend for directing syslog to stderr or stdout if running in foreground ### Corrected Bugs - +* Setting /www-data with www-data as owner, see https://github.com/clicon/clixon/issues/37 + ### Known issues * Namespace name relabeling is not supported. * Eg: if "des" is defined as prefix for an imported module, then a relabeling using xmlfns is not supported, such as: diff --git a/apps/restconf/Makefile.in b/apps/restconf/Makefile.in index d54f1255..431d64cb 100644 --- a/apps/restconf/Makefile.in +++ b/apps/restconf/Makefile.in @@ -45,12 +45,14 @@ bindir = @bindir@ libdir = @libdir@ mandir = @mandir@ libexecdir = @libexecdir@ -wwwdir = /www-data localstatedir = @localstatedir@ sysconfdir = @sysconfdir@ includedir = @includedir@ HOST_VENDOR = @host_vendor@ +wwwdir = /www-data +wwwuser = www-data + SH_SUFFIX = @SH_SUFFIX@ CLIXON_MAJOR = @CLIXON_VERSION_MAJOR@ CLIXON_MINOR = @CLIXON_VERSION_MINOR@ @@ -97,8 +99,9 @@ distclean: clean # Put other executables in libexec/ # Also create a libexec/ directory for writeable/temporary files. # Put config file in etc/ +# Shouldnt www-dir be owned by www-data? install: install-lib $(APPL) - install -d -m 0755 $(DESTDIR)$(wwwdir) + install -d -m 0755 -o $(wwwuser) -g $(wwwuser) $(DESTDIR)$(wwwdir) install -m 0755 $(INSTALLFLAGS) $(APPL) $(DESTDIR)$(wwwdir) install-lib: $(MYLIB)