Merge branch 'dev'

Opmantek · Jun 18, 2018 · 52c6903 · 52c6903
2 parents 29789c4 + c954843
commit 52c6903
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/code_igniter/application/controllers/db_upgrades/db_2.2.4.php b/code_igniter/application/controllers/db_upgrades/db_2.2.4.php
@@ -34,6 +34,11 @@
 // $this->m_roles->update_permissions(2, 'maps', 'crud');
 // $this->m_roles->update_permissions(3, 'maps', 'crud');
 
+# configuration - remove the Maps API key
+$sql = "UPDATE `configuration` SET `value` = '' WHERE `name` = 'maps_api_key' and value = 'AIzaSyAhAUqssRASeC0Pfyx1TW1DXRmboG5bdG0'";
+$this->db->query($sql);
+$this->log_db($this->db->last_query());
+
 # set our versions
 $sql = "UPDATE `configuration` SET `value` = '20180630' WHERE `name` = 'internal_version'";
 $this->db->query($sql);

diff --git a/other/openaudit_mysql.sql b/other/openaudit_mysql.sql
@@ -602,7 +602,7 @@ INSERT INTO `configuration` VALUES (NULL,'log_retain_level_4','180','number','y'
 INSERT INTO `configuration` VALUES (NULL,'log_retain_level_5','90','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 5.');
 INSERT INTO `configuration` VALUES (NULL,'log_retain_level_6','30','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 6.');
 INSERT INTO `configuration` VALUES (NULL,'log_retain_level_7','7','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 7.');
-INSERT INTO `configuration` VALUES (NULL,'maps_api_key','AIzaSyAhAUqssRASeC0Pfyx1TW1DXRmboG5bdG0','text','y','system','2000-01-01 00:00:00','The API key for Google Maps.');
+INSERT INTO `configuration` VALUES (NULL,'maps_api_key','','text','y','system','2000-01-01 00:00:00','The API key for Google Maps.');
 INSERT INTO `configuration` VALUES (NULL,'maps_url','/omk/open-audit/map','text','y','system','2000-01-01 00:00:00','The web server address of opMaps.');
 INSERT INTO `configuration` VALUES (NULL,'match_dbus','n','bool','y','system','2000-01-01 00:00:00','Should we match a device based on its dbus id.');
 INSERT INTO `configuration` VALUES (NULL,'match_fqdn','y','bool','y','system','2000-01-01 00:00:00','Should we match a device based on its fqdn.');