Fix empty openvpn directory (git)

Fix vdr configuration files

diff --git a/config/vdr/etc/channels.conf b/config/vdr/etc/channels.conf
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/lfs/openvpn b/lfs/openvpn
index 43fc61a1f1444121cb6a1133dff069114d204ff0..91a40816059c9c602ed78684d20359fe02ccc90c 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -75,11 +75,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
+       -mkdir -p /var/ipfire/ovpn/ca
+       -mkdir -p /var/ipfire/ovpn/crls
        chown -R nobody:nobody /var/ipfire/ovpn
        chown root.nobody /var/log/ovpnserver.log
        chmod 755 /var/ipfire/ovpn/verify
        chmod 660 /var/log/ovpnserver.log
        chmod 700 /var/ipfire/ovpn/certs
-       -cd $(DIR_APP) && find /var/ipfire/ovpn -name .svn -exec rm -rf {} \;
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/lfs/vdr b/lfs/vdr
index 03ee96853f6ab72610de41e059c8f631db17a24a..f1aee1679755737fd1f65e9d5a0fb3711a2e34eb 100644 (file)
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -85,8 +85,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING)
        cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING)
        cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install
-       -mkdir -p /var/video/plugins/ 
+       -mkdir -p /opt/vdr/etc
        cd $(DIR_APP) && install *.conf /opt/vdr/etc/
-       cp -f $(DIR_SRC)/config/vdr/* /opt/vdr/
+       cp -Rvf $(DIR_SRC)/config/vdr /opt
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)