From ebf21b45fb7d38bd2d3c12581cfc7711decb6b42 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Tue, 2 Apr 2019 15:43:00 -0400
Subject: [PATCH] install all recently added conf files

---
 .../citadel-config/citadel-config-gnome.bb    | 16 +++++++++++++-
 .../citadel-config/citadel-config.bb          | 21 ++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
index 3aab2d9..f7b5d24 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config-gnome.bb
@@ -3,15 +3,29 @@ HOMEPAGE = ""
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
+DEPENDS = "dconf-native"
+
 S = "${WORKDIR}"
 
-SRC_URI = "file://gsettings/90_citadel.gschema.override"
+SRC_URI = "\
+    file://gsettings/90_citadel.gschema.override \
+    file://dconf/build.d/initial-realm-dconf.conf \
+"
 
 inherit allarch gsettings
 
+# Build the binary dconf database which is installed by default into each new realm
+do_compile() {
+    mkdir -p ${WORKDIR}/dconf-output
+    dconf compile ${WORKDIR}/dconf-output/user ${S}/dconf/build.d
+}
+
 do_install() {
     install -d ${D}${datadir}/glib-2.0/schemas
+    install -d ${D}${sysconfdir}/skel/.config/dconf
+
     install -m 644 ${S}/gsettings/90_citadel.gschema.override ${D}${datadir}/glib-2.0/schemas
+    install -m 644 ${WORKDIR}/dconf-output/user ${D}${sysconfdir}/skel/.config/dconf
 }
 
 FILES_${PN} = "/"
diff --git a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
index 6a95076..8b2dfb6 100644
--- a/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
+++ b/meta-citadel/recipes-citadel/citadel-config/citadel-config.bb
@@ -48,6 +48,11 @@ SRC_URI = "\
     file://iptables-flush.sh \
     file://systemd/zram-swap.service \
     file://systemd/iptables.service \
+    file://skel/profile \
+    file://skel/bashrc \
+    file://skel/vimrc \
+    file://apt-cacher-ng/acng.conf \
+    file://apt-cacher-ng/security.conf \
     ${DEFAULT_REALM_UNITS} \
     ${MODPROBE_CONFIG} \
     ${SYSCTL_CONFIG} \
@@ -79,6 +84,7 @@ do_install() {
     install -m 0755 -d ${D}${sysconfdir}/polkit-1/rules.d
     install -m 0755 -d ${D}${sysconfdir}/modprobe.d
     install -m 0755 -d ${D}${datadir}/iptables
+    install -m 0755 -d ${D}${datadir}/factory/skel
     install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager
     install -m 0700 -d ${D}${localstatedir}/lib/NetworkManager/system-connections
 
@@ -97,6 +103,11 @@ do_install() {
     install -m 644 ${WORKDIR}/systemd/launch-default-realm.path ${D}${systemd_system_unitdir}
     install -m 644 ${WORKDIR}/systemd/launch-default-realm.service ${D}${systemd_system_unitdir}
 
+    # skel files for new realms
+    install -m 644 -T ${WORKDIR}/skel/profile ${D}${sysconfdir}/skel/.profile
+    install -m 644 -T ${WORKDIR}/skel/bashrc ${D}${sysconfdir}/skel/.bashrc
+    install -m 644 -T ${WORKDIR}/skel/vimrc ${D}${sysconfdir}/skel/.vimrc
+
     # disable some pax and grsecurity features so that debootstrap will work
     # this should be removed later
     install -m 0644 ${WORKDIR}/sysctl/99-grsec-debootstrap.conf ${D}${libdir}/sysctl.d/
@@ -113,14 +124,18 @@ do_install() {
     install -m 0644 ${WORKDIR}/iptables/empty-filter.rules ${D}${datadir}/iptables/
     install -m 0644 ${WORKDIR}/iptables-flush.sh ${D}${datadir}/iptables/
 
-    install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
-    install -m 0644 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
-    install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${sysconfdir}/skel/.vimrc
+    install -m 0644 ${WORKDIR}/share/dot.bashrc ${D}${datadir}/factory/skel/.bashrc
+    install -m 0644 ${WORKDIR}/share/dot.profile ${D}${datadir}/factory/skel/.profile
+    install -m 0644 ${WORKDIR}/share/dot.vimrc ${D}${datadir}/factory/skel/.vimrc
 
     install -m 0644 ${WORKDIR}/polkit/citadel.rules ${D}${sysconfdir}/polkit-1/rules.d/
 
     install -m 0644 ${WORKDIR}/modprobe.d/audio_powersave.conf ${D}${sysconfdir}/modprobe.d/
 
+    install -d ${D}${datadir}/apt-cacher-ng/conf
+    install -m 0644 ${WORKDIR}/apt-cacher-ng/acng.conf ${D}${datadir}/apt-cacher-ng/conf/
+    install -m 0644 ${WORKDIR}/apt-cacher-ng/security.conf ${D}${datadir}/apt-cacher-ng/conf/
+
     # This probably belongs in lvm2 recipe
     install -d ${D}${systemd_system_unitdir}/sysinit.target.wants
     ln -s ../lvm2-lvmetad.socket ${D}${systemd_system_unitdir}/sysinit.target.wants/lvm2-lvmetad.socket