Updated vpn.in (converted to the new c3d format).

diff --git a/sources/vpn.in/firstboot/01_setupnetworking.sh b/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh
similarity index 98%
rename from sources/vpn.in/firstboot/01_setupnetworking.sh
rename to sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh
index dcde4ae9c5f436ed8fcaba9f19a1ab38c0b92bd2..826c95a37e2229ccf9f41b3815b09bfab7253814 100755 (executable)
--- a/sources/vpn.in/firstboot/01_setupnetworking.sh
+++ b/sources/vpn.in/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 
+export PAGER=
+
+
 sleep 1
 systemctl --quiet is-active NetworkManager.service
 NM_RC=$?

diff --git a/sources/vpn.in/firstboot/02_settimezone.sh b/sources/vpn.in/c3d/firstboot/scripts/02_settimezone.sh
similarity index 100%
rename from sources/vpn.in/firstboot/02_settimezone.sh
rename to sources/vpn.in/c3d/firstboot/scripts/02_settimezone.sh

diff --git a/sources/vpn.in/firstboot/90_setupservices.sh b/sources/vpn.in/c3d/firstboot/scripts/90_setupservices.sh
similarity index 100%
rename from sources/vpn.in/firstboot/90_setupservices.sh
rename to sources/vpn.in/c3d/firstboot/scripts/90_setupservices.sh

diff --git a/sources/vpn.in/c3d/mode.txt b/sources/vpn.in/c3d/mode.txt
new file mode 100644 (file)
index 0000000..3b70d83
--- /dev/null
+++ b/sources/vpn.in/c3d/mode.txt
@@ -0,0 +1,4 @@
+# mode file (relative to /c3d)
+755 firstboot/scripts/*.sh
+755 postinstall/install-data/etc/wireguard/setup/genkeys.sh
+755 postinstall/scripts/*.sh

diff --git a/sources/vpn.in/postinstall/install/etc/sysctl.d/01-ipv4.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/sysctl.d/01-ipv4.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/sysctl.d/01-ipv4.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/sysctl.d/01-ipv4.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/akosztolanyi.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/akosztolanyi.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/akosztolanyi.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/akosztolanyi.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/csgulyas.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/csgulyas.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/csgulyas.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/csgulyas.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/cslevai.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/cslevai.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/cslevai.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/cslevai.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/dvasary.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/dvasary.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/dvasary.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/dvasary.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/flex.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/flex.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/flex.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/flex.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/fritter.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/fritter.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/fritter.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/fritter.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/fschnell.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/fschnell.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/fschnell.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/fschnell.conf

diff --git a/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/genkeys.sh b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/genkeys.sh
new file mode 100755 (executable)
index 0000000..5b1f41a
--- /dev/null
+++ b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/genkeys.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+
+echo
+COUNT=0
+while [ $COUNT -lt 25000000 ]
+do
+    PRIV_KEY=$(wg genkey)
+    PUB_KEY=$(echo $PRIV_KEY | wg pubkey)
+    echo "private: $PRIV_KEY public: $PUB_KEY" >>keys.txt
+    COUNT=$(( $COUNT + 1 ))
+done
+echo

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/keys.txt b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/keys.txt
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/keys.txt

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/khorvath.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/khorvath.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/khorvath.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/khorvath.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/kkele.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/kkele.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/kkele.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/kkele.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/kvajda.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/kvajda.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/kvajda.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/kvajda.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/mszabo.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/mszabo.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/mszabo.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/mszabo.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/pbognar.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/pbognar.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/pbognar.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/pbognar.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/qqcs.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/qqcs.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/qqcs.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/qqcs.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/rrendek.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/rrendek.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/rrendek.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/rrendek.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/setup/zfelleg.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/zfelleg.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/setup/zfelleg.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/setup/zfelleg.conf

diff --git a/sources/vpn.in/postinstall/install/etc/wireguard/wgs.conf b/sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf
similarity index 100%
rename from sources/vpn.in/postinstall/install/etc/wireguard/wgs.conf
rename to sources/vpn.in/c3d/postinstall/install-data/etc/wireguard/wgs.conf

diff --git a/sources/vpn.in/postinstall/10_setupservices.sh b/sources/vpn.in/c3d/postinstall/scripts/10_setupservices.sh
similarity index 71%
rename from sources/vpn.in/postinstall/10_setupservices.sh
rename to sources/vpn.in/c3d/postinstall/scripts/10_setupservices.sh
index da992d8d8eea260902024e1d69111818828c9915..050d4c918e009f8d5bf2c09edaf79dbc679e9595 100755 (executable)
--- a/sources/vpn.in/postinstall/10_setupservices.sh
+++ b/sources/vpn.in/c3d/postinstall/scripts/10_setupservices.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-systemctl disable wg-quick@wgs
+systemctl disable wg-quick@wgs.service
 systemctl disable NetworkManager-wait-online.service
 
 systemctl disable logrotate.timer

diff --git a/sources/vpn.in/envvars b/sources/vpn.in/envvars
index 75da218610e24513482c4dd15986787082f44a8a..11dab077d146b91e7df23da50ebbd0ec6ef687c4 100644 (file)
--- a/sources/vpn.in/envvars
+++ b/sources/vpn.in/envvars
@@ -1,5 +1,3 @@
 DISTRIBUTION=Fedora
 DISTRIBUTION_VERSION=37
-ROOT_PACKAGES="hostname initscripts iproute rootfiles systemd-udev"
-BASE_PACKAGES="NetworkManager iputils logrotate rsyslog tar vim-minimal"
 SPEC_PACKAGES="wireguard-tools"

diff --git a/sources/vpn.in/firstboot/99_cleanup.sh b/sources/vpn.in/firstboot/99_cleanup.sh
deleted file mode 100755 (executable)
index b87f2f4..0000000
--- a/sources/vpn.in/firstboot/99_cleanup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-echo rm -Rf $REAL_PATH

diff --git a/sources/vpn.in/postinstall/01_setownership.sh b/sources/vpn.in/postinstall/01_setownership.sh
deleted file mode 100755 (executable)
index f2e6b94..0000000
--- a/sources/vpn.in/postinstall/01_setownership.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install
-
-chown -R root.root $SOURCE_PATH/*

diff --git a/sources/vpn.in/postinstall/02_setpermissions.sh b/sources/vpn.in/postinstall/02_setpermissions.sh
deleted file mode 100755 (executable)
index 241386a..0000000
--- a/sources/vpn.in/postinstall/02_setpermissions.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-SOURCE_PATH=$REAL_PATH/install

diff --git a/sources/vpn.in/postinstall/03_installfiles.sh b/sources/vpn.in/postinstall/03_installfiles.sh
deleted file mode 100755 (executable)
index e4ee7ff..0000000
--- a/sources/vpn.in/postinstall/03_installfiles.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-tar --create \
-    --directory=$REAL_PATH \
-    --exclude=.placeholder \
-    --to-stdout \
-    install \
-    | tar --extract \
-          --backup \
-          --directory=/ \
-          --no-overwrite-dir \
-          --strip-components=1 \
-          --suffix=.orig

diff --git a/sources/vpn.in/postinstall/99_cleanup.sh b/sources/vpn.in/postinstall/99_cleanup.sh
deleted file mode 100755 (executable)
index b87f2f4..0000000
--- a/sources/vpn.in/postinstall/99_cleanup.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-
-REAL_PATH=$(dirname $(realpath $0))
-
-echo rm -Rf $REAL_PATH