Commit a75f0287 authored by jan.koester's avatar jan.koester
Browse files

test

parent 627b7ce2
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
usr/bin/blogi-editor
etc/blogi-editor/config.yaml
usr/lib/blogi/plugins/webedit/
usr/lib/blogi/libblogidev.a
usr/share/blogi-editor/html/
+7 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ case "$1" in
        if [ -d /opt/blogi/var/lib/blogi ]; then
            chown 999:999 /opt/blogi/var/lib/blogi
        fi

        # Install default editor config in container if none exists
        if [ -d /opt/blogi ] && [ ! -f /opt/blogi/etc/blogi-editor/config.yaml ]; then
            mkdir -p /opt/blogi/etc/blogi-editor
            cp /usr/share/blogi-editor/blogi-editor.default-config.yaml /opt/blogi/etc/blogi-editor/config.yaml
            chmod 640 /opt/blogi/etc/blogi-editor/config.yaml
        fi
        ;;
esac

+5 −0
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ ifeq ($(IS_NONSPAWN),)
	echo "blogi:x:999:" >> debian/blogi/opt/blogi/etc/group
	# SSL directory
	mkdir -p debian/blogi/opt/blogi/etc/blogi/ssl
	# Move cmake-installed configs to default locations (don't overwrite on upgrade)
	rm -f debian/blogi/opt/blogi/etc/blogi-editor/config.yaml
	install -D -m 644 debian/blogi-editor.default-config.yaml debian/blogi/usr/share/blogi-editor/blogi-editor.default-config.yaml
	# nspawn and systemd config (on host)
	install -D -m 644 debian/blogi.nspawn debian/blogi/etc/systemd/nspawn/blogi.nspawn
	install -D -m 644 debian/blogi.default-config.yaml debian/blogi/usr/share/blogi/blogi.default-config.yaml
@@ -128,6 +131,8 @@ ifeq ($(IS_NONSPAWN),)
	fi
else
	dh_install
	# Install default config for blogi-editor (not directly to /etc, postinst handles that)
	install -D -m 644 debian/blogi-editor.default-config.yaml debian/blogi-editor/usr/share/blogi-editor/blogi-editor.default-config.yaml
endif

override_dh_fixperms: