Merge pull request #2855 from irontec/PROVIDER-2130-fix-iso-image-ins…

…tall Fix ISO image Debian dependencies
irontec · Jan 7, 2025 · 6df494d · 6df494d
2 parents 065fa30 + 5aea8b2
commit 6df494d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/debian/ivozprovider-profile-as.links b/debian/ivozprovider-profile-as.links
@@ -1,2 +1 @@
-/etc/odbcinst.ini.ivozprovider  /etc/odbcinst.ini
 /etc/odbc.ini.ivozprovider      /etc/odbc.ini
diff --git a/debian/ivozprovider-profile-as.postinst b/debian/ivozprovider-profile-as.postinst
@@ -44,11 +44,19 @@ function setup_default_dial_opts()
     sed -i -r "s/(DIAL_DEF_OPTS *= *).*/\1$DIAL_DEF_OPTS/"  /etc/asterisk/extensions.conf
 }
 
+function setup_odbcinst()
+{
+    if ! odbcinst -q -d -n "MYSQL" >/dev/null 2>&1; then
+        odbcinst -i -d -f /etc/odbcinst.ini.ivozprovider
+    fi
+}
+
 #######################################################################################################################
 #######################################################################################################################
 setup_php
 setup_mysql_access
 setup_fastagi_server
 setup_default_dial_opts
+setup_odbcinst
 
 :
diff --git a/doc/dev/AcceptedCommitTagsList.txt b/doc/dev/AcceptedCommitTagsList.txt
@@ -8,6 +8,7 @@ data
 doc
 docker
 feature
+iso
 kamailio
 kamtrunks
 kamusers

diff --git a/extra/simple-cdd/profiles/ivozprovider.downloads b/extra/simple-cdd/profiles/ivozprovider.downloads
@@ -4,6 +4,7 @@
 # libgnutls-openssl27
 # libgnutls30
 perl-openssl-defaults
+zstd
 
 # Main iso package
 ivozprovider
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		/etc/odbcinst.ini.ivozprovider /etc/odbcinst.ini
		/etc/odbc.ini.ivozprovider /etc/odbc.ini
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,7 @@ data @@
     doc
     docker
     feature
+    iso
     kamailio
     kamtrunks
     kamusers
@@ Expand Down @@