Skip to content

strongswan: update init script and migrate to /etc/config/swanctl #30504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
feckert wants to merge 25 commits into
base: master
Choose a base branch
from
+1,194 −306
Open

strongswan: update init script and migrate to /etc/config/swanctl #30504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b62d063
strongswan: enable plugins-packaged-separately option
feckert Jun 12, 2026
e638332
strongswan: unify tunnel/transport child sections to add further chil…
feckert Sep 8, 2026
adfaca9
strongswan: move globals debug option to dedicated syslog plugin section
feckert Sep 8, 2026
4b746db
strongswan: add support for custom_proposal option
feckert Sep 9, 2026
f0f4060
strongswan: migrate legacy dpdaction option to dpd_action
feckert Sep 10, 2026
4d0067e
strongswan: rename closeaction to close_action
feckert Sep 10, 2026
4263ea8
strongswan: rename startaction to start_action
feckert Sep 15, 2026
698b603
strongswan: rename rekeytime to rekey_time in child
feckert Sep 11, 2026
95b2690
strongswan: rename lifetime to life_time in child
feckert Sep 11, 2026
0984371
strongswan: rename rekeybytes to rekey_bytes child
feckert Sep 11, 2026
4b22eea
strongswan: rename lifebytes to life_bytes in child
feckert Sep 11, 2026
5009413
strongswan: rename rekeypackets to rekey_packets child
feckert Sep 11, 2026
a18d5d6
strongswan: rename lifepackets to life_packets in child
feckert Sep 11, 2026
1e26544
strongswan: rename rekeytime to rekey_time in remote
feckert Sep 11, 2026
4559f19
strongswan: rename overtime to over_time in remote
feckert Sep 11, 2026
1ad1bac
strongswan: rename dpddelay to dpd_delay in remote
feckert Sep 11, 2026
1b56538
strongswan: fix ipsec globals section type
feckert Sep 14, 2026
7068d6d
strongswan: add uci shunt configuration
feckert Sep 10, 2026
f50f5b9
strongswan: add kernel-netlink plugin config generation for install_r…
feckert Jul 10, 2026
03f916d
strongswan: also reload strongswan.conf on service reload
feckert Sep 15, 2026
38d3805
strongswan: stop automatic migration via uci-defaults
feckert Sep 18, 2026
d7d2667
strongswan: switch to the swanctl uci config file
feckert Sep 18, 2026
e9e1105
strongswan: add migrate command to swanctl.init
feckert Sep 18, 2026
7f8ad2a
strongswan: add back legacy config generation for old uci ipsec
feckert Sep 18, 2026
5a6ec39
strongswan: bump PKG_RELEASE to 8
feckert Sep 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions net/strongswan/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=strongswan
PKG_VERSION:=6.0.7
PKG_RELEASE:=7
PKG_RELEASE:=8

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://download.strongswan.org/ https://download2.strongswan.org/
Expand Down Expand Up @@ -450,6 +450,7 @@ CONFIGURE_ARGS+= \
--enable-mgf1 \
--enable-mediation \
--with-systemdsystemunitdir=no \
--with-plugins-packaged-separately=yes \
PYTHON="python3" \
$(if $(CONFIG_PACKAGE_strongswan-charon-cmd),--enable-cmd,--disable-cmd) \
$(if $(CONFIG_PACKAGE_strongswan-mod-gmpdh),--enable-gmpdh,) \
Expand Down Expand Up @@ -551,7 +552,7 @@ define Package/strongswan-pki/install
endef

define Package/strongswan-swanctl/conffiles
/etc/config/ipsec
/etc/config/swanctl
Comment thread
feckert marked this conversation as resolved.
/etc/swanctl/
endef

Expand All @@ -565,12 +566,11 @@ define Package/strongswan-swanctl/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/swanctl $(1)/usr/sbin/
$(INSTALL_BIN) ./files/swanctl.init $(1)/etc/init.d/swanctl
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/ipsec.config $(1)/etc/config/ipsec
$(INSTALL_CONF) ./files/swanctl.config $(1)/etc/config/swanctl
Comment thread
feckert marked this conversation as resolved.

# Install migration from 'ipsec@ipsec[-1]' to 'ipsec.globals'
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_DATA) ./files/etc/uci-defaults/strongswan \
$(1)/etc/uci-defaults/strongswan
$(INSTALL_DIR) $(1)/usr/libexec/strongswan/
$(INSTALL_BIN) ./files/usr/libexec/strongswan/migrate-ipsec-to-swanctl \
$(1)/usr/libexec/strongswan/
endef

define Package/strongswan-gencerts/install
Expand Down
154 changes: 0 additions & 154 deletions net/strongswan/files/etc/uci-defaults/strongswan
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion net/strongswan/files/ipsec.config → net/strongswan/files/swanctl.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
# This is the 'globals' config section for the 'strongswan.conf' file.
# For LuCI the section type ipsec should only appear once. It must therefore
# always be present and should not be added or removed manually.
config ipsec 'globals'
config globals 'globals'
Comment thread
feckert marked this conversation as resolved.

config syslog 'syslog'
Loading
Loading