Updated xfr.pm (converted to the new c3d format).

diff --git a/sources/xfr.pm/c3d/firstboot/scripts/01_setupnetworking.sh b/sources/xfr.pm/c3d/firstboot/scripts/01_setupnetworking.sh
index 8fc291d7c7135eb18a7d2d0dd56fa83aaff7ae27..42694c1945b9a5acf9396858708108054daae0a1 100755 (executable)
--- a/sources/xfr.pm/c3d/firstboot/scripts/01_setupnetworking.sh
+++ b/sources/xfr.pm/c3d/firstboot/scripts/01_setupnetworking.sh
@@ -67,12 +67,17 @@ nmcli connection add \
     connection.id perimeter \
     connection.interface-name $CONNECTION_DEVICE \
     connection.type 802-3-ethernet \
-    ipv4.addresses "192.168.173.251/24" \
-    ipv4.dns "192.168.173.174" \
+    ipv4.addresses "192.168.173.174/24" \
+    ipv4.dns "192.168.173.223" \
     ipv4.dns-search "pm.user.hu" \
     ipv4.gateway "192.168.173.254" \
     ipv4.method "manual" \
-    ipv6.method "auto" \
+    ipv6.addresses "2001:1aa1:000a:7c0c:000c:18ff:fe03:adae/64" \
+    ipv6.dns "2001:1aa1:000a:7c0c:000c:18ff:fe03:addf" \
+    ipv6.dns-search "pm.useribm.hu" \
+    ipv6.gateway "2001:1aa1:000a:7c0c:000c:18ff:fe03:adfe" \
+    ipv6.method "manual" \
+    ipv6.routes "2001:1aa1:000a:7dae::/64 2001:1aa1:000a:7c0c:000c:18ff:fe03:ad01" \
     save yes
 
 nmcli connection show

diff --git a/sources/xfr.pm/c3d/firstboot/scripts/90_setupservices.sh b/sources/xfr.pm/c3d/firstboot/scripts/90_setupservices.sh
new file mode 100644 (file)
index 0000000..c8815a0
--- /dev/null
+++ b/sources/xfr.pm/c3d/firstboot/scripts/90_setupservices.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+
+systemctl enable httpd.service
+systemctl start httpd.service
+systemctl enable NetworkManager-wait-online.service
+systemctl start NetworkManager-wait-online.service
+
+systemctl enable logrotate.timer
+systemctl start logrotate.timer

diff --git a/sources/xfr.pm/c3d/mode.txt b/sources/xfr.pm/c3d/mode.txt
index 9b8459ecde641030dc624a42b3a7fa391a1ec5c8..d0ff0b1f50393f067b973375cf3575504bf4b2e0 100644 (file)
--- a/sources/xfr.pm/c3d/mode.txt
+++ b/sources/xfr.pm/c3d/mode.txt
@@ -1,4 +1,3 @@
 # mode file (relative to /c3d)
 755 firstboot/scripts/*.sh
-755 postinstall/install-data/usr/local/bin/*
 755 postinstall/scripts/*.sh

diff --git a/sources/xfr.pm/c3d/postinstall/scripts/01_setownership.sh b/sources/xfr.pm/c3d/postinstall/scripts/01_setownership.sh
deleted file mode 100755 (executable)
index f2e6b94..0000000
--- a/sources/xfr.pm/c3d/postinstall/scripts/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/xfr.pm/c3d/postinstall/scripts/02_setpermissions.sh b/sources/xfr.pm/c3d/postinstall/scripts/02_setpermissions.sh
deleted file mode 100755 (executable)
index 241386a..0000000
--- a/sources/xfr.pm/c3d/postinstall/scripts/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/xfr.pm/c3d/postinstall/scripts/03_installfiles.sh b/sources/xfr.pm/c3d/postinstall/scripts/03_installfiles.sh
deleted file mode 100755 (executable)
index e4ee7ff..0000000
--- a/sources/xfr.pm/c3d/postinstall/scripts/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/xfr.pm/c3d/postinstall/scripts/10_setupservices.sh b/sources/xfr.pm/c3d/postinstall/scripts/10_setupservices.sh
index eab2b099ec4f264101d929f83fac9a4419e86093..4cec25faaf13a17f2e36019a328196c593b474e2 100755 (executable)
--- a/sources/xfr.pm/c3d/postinstall/scripts/10_setupservices.sh
+++ b/sources/xfr.pm/c3d/postinstall/scripts/10_setupservices.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-systemctl enable httpd.service
-systemctl enable NetworkManager-wait-online.service
+systemctl disable httpd.service
+systemctl disable NetworkManager-wait-online.service
 
-systemctl enable logrotate.timer
+systemctl disable logrotate.timer

diff --git a/sources/xfr.pm/c3d/postinstall/scripts/99_cleanup.sh b/sources/xfr.pm/c3d/postinstall/scripts/99_cleanup.sh
deleted file mode 100755 (executable)
index b87f2f4..0000000
--- a/sources/xfr.pm/c3d/postinstall/scripts/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/xfr.pm/config b/sources/xfr.pm/config
index 73bb672f2fcc1428c1b50bf2cce521b7ca9d30bb..463193e398ffc556129476f9a10d29e618154e3f 100644 (file)
--- a/sources/xfr.pm/config
+++ b/sources/xfr.pm/config
@@ -9,7 +9,7 @@ lxc.mount.entry = __CONTAINER_FILESYSTEMS_PATH__/www.xfr var/www.xfr none bind,c
 lxc.net.0.type = veth
 lxc.net.0.flags = up
 lxc.net.0.link = brch-dev
-lxc.net.0.hwaddr = 02:0c:18:03:ad:fb
+lxc.net.0.hwaddr = 02:0c:18:03:ad:ae
 
 lxc.autodev = 1
 

diff --git a/sources/xfr.pm/envvars b/sources/xfr.pm/envvars
index 88e4883cfe3c6f31aaf8233f8b98c9578c0b271c..88cb266696fa61ff3ade22885ea75eab1a099b63 100644 (file)
--- a/sources/xfr.pm/envvars
+++ b/sources/xfr.pm/envvars
@@ -1,5 +1,4 @@
 DISTRIBUTION=Fedora
 DISTRIBUTION_VERSION=38
-ROOT_PACKAGES="hostname initscripts iproute rootfiles systemd-udev"
-BASE_PACKAGES="NetworkManager iputils logrotate rsyslog tar vim-minimal"
-SPEC_PACKAGES="httpd mod_wsgi"
+SPEC_PACKAGES="httpd \
+               mod_wsgi"