diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2020-02-16 17:40:40 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2020-02-17 16:34:42 +0100 |
| commit | 72baab7aa343fbdd4246799c503eb8451a9551ff (patch) | |
| tree | fef77bf7a04386c962a87bf1ceb6b60eabc9bb4c /main | |
| parent | cb6626c4c2e5a81fb6d570bf7e4954aff0ca16e1 (diff) | |
| download | aports-72baab7aa343fbdd4246799c503eb8451a9551ff.tar.bz2 aports-72baab7aa343fbdd4246799c503eb8451a9551ff.tar.xz | |
main/freeradius: change default cui sqlite location to $db_dir/
It's a database, so it shouldn't be in /var/log.
Diffstat (limited to 'main')
| -rw-r--r-- | main/freeradius/APKBUILD | 4 | ||||
| -rw-r--r-- | main/freeradius/default-config.patch | 11 | ||||
| -rw-r--r-- | main/freeradius/freeradius.post-upgrade | 10 |
3 files changed, 23 insertions, 2 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD index babf2f2809..39a34d9fcc 100644 --- a/main/freeradius/APKBUILD +++ b/main/freeradius/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=freeradius pkgver=3.0.20 -pkgrel=7 +pkgrel=8 pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server" url="https://freeradius.org/" arch="all" @@ -397,7 +397,7 @@ a66ab5d3f1c86450e9c50aa8be10a40fb4118467670048773ad8c80b5f3fb958dd3addc6ef245289 5f940e200aa39b2fbbfaf5b24f2ad99869fa75bb7e2008876940ea96cb9dbc7f2b27dd1672aa56cdb5243faabdcbc38875594dd8792af965987183c0aa2aefd1 print-var.mk c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d7940c5963aed664b85da28442b388c9fb8cc27873df03b2d musl-fix-headers.patch 41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch -58454213c3fccdb7463f36154b2146f4d38e8566eacf7350b74ff926f07b9c163cc4b7a97f2e3d1e959baf80b0db58dd553bbc3c8fcbf0f7ef80f9bcbeead3bd default-config.patch +0a60e3a5eff133898292cee4935d2d50c4a8a79c8357446999f12a368dac47abc4af4a09478cea001968f78791dca0eab305aaa3ee397ef09ebcc378b17f5ad0 default-config.patch f96b7b2e0fc614cb8b70bd500933538e98e05b58718af931a62bc7ba2307600cf8c2a8a99de856ad2e18101dd5bfe95c50ee34de20eef21ba0ad795577a6619b remove-eap-from-default-mods.patch 55e179d5e6b31d289c2da7f907e494a6a6f5900483fdff8d3bb25ee15a583b8705942eca1f0d5390e91376966e66e457dce9b2cf1a1f61c8eac6d8fb825404dd readme-setup-script.patch f88cb4ae335d67211c8563b6df88e20ee3729e57aa56423f99b518f83b190479b38bb189a0ab53c70ef9709a6229ccaa506ea6b79844cbfd4f2a7f0c7c292045 Fix-permissions-of-certs-in-bootstrap-fallback.patch diff --git a/main/freeradius/default-config.patch b/main/freeradius/default-config.patch index d617ab4cd6..520d75cbd0 100644 --- a/main/freeradius/default-config.patch +++ b/main/freeradius/default-config.patch @@ -74,3 +74,14 @@ ca_path = "/etc/ssl/certs/" certificate_file = "/etc/ssl/certs/private/client.crt" private_key_file = "/etc/ssl/certs/private/client.key" +--- a/raddb/mods-available/cui ++++ b/raddb/mods-available/cui +@@ -29,7 +29,7 @@ + driver = "rlm_sql_${dialect}" + + sqlite { +- filename = ${radacctdir}/cui.sqlite ++ filename = ${db_dir}/cui.sqlite + bootstrap = ${modconfdir}/${..:name}/cui/sqlite/schema.sql + } + diff --git a/main/freeradius/freeradius.post-upgrade b/main/freeradius/freeradius.post-upgrade index d047ad7a43..9636b7752a 100644 --- a/main/freeradius/freeradius.post-upgrade +++ b/main/freeradius/freeradius.post-upgrade @@ -14,4 +14,14 @@ if [ "$(apk version -t "$ver_old" "3.0.20-r4")" = "<" ]; then setup-freeradius enable-default-mods >/dev/null 2>&1 fi +if [ "$(apk version -t "$ver_old" "3.0.20-r8")" = "<" ]; then + cuidb_file_old='/var/log/radius/radacct/cui.sqlite' + cuidb_file_new='/var/lib/radiusd/cui.sqlite' + + if [ -f "$cuidb_file_old" ] && ! [ -e "$cuidb_file_new" ]; then + echo "* Moving $cuidb_file_old to $cuidb_file_new" >&2 + mv "$cuidb_file_old" "$cuidb_file_new" + fi +fi + exit 0 |