[-]
[+]
|
Changed |
_service:set_version:inventory-system.spec
|
|
[-]
[+]
|
Changed |
_service:recompress:tar_scm:inventory-system-0.0.rev1507.tar.bz2/client/inventory-system.sh
^
|
@@ -255,7 +255,7 @@
function get_system_software {
PACKAGES=`${RPM} -qa --queryformat '%{name}-%{version}-%{release}.%{arch} '`
debug "SYSTEM-SOFTWARE: ${PACKAGES}"
- echo ${PACKAGEs}
+ echo ${PACKAGES}
}
# encode url parameters
rawurlencode() {
@@ -313,8 +313,11 @@
}
###### now output system data ######
-
-${CURL} -s -d "`build_request`" ${TARGETURL} >/dev/null
+if [ -n "`echo ${TARGETURL} | grep ^https`" ] ; then
+ ${CURL} -s -k -d "`build_request`" ${TARGETURL} >/dev/null
+else
+ ${CURL} -s -d "`build_request`" ${TARGETURL} >/dev/null
+fi
if [ $? != 0 ] ; then
debug "Data upload failed!"
fi
|
[-]
[+]
|
Added |
_service:recompress:tar_scm:inventory-system-0.0.rev1507.tar.bz2/server/inv.sql
^
|
@@ -0,0 +1,13 @@
+CREATE TABLE IF NOT EXISTS `inv_system` (
+ `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `system_uuid` varchar(36) NOT NULL,
+ `imported` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `inv_system_properties` (
+ `inv_system_id` int(11) NOT NULL,
+ `datakey` varchar(50) NOT NULL,
+ `value` text NOT NULL,
+ `changed` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|