YunoHost-Apps/phpipam_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/phpipam_ynh.git synced 2024-09-03 19:56:39 +02:00
Code Issues Activity Actions 1

fix

Browse source
This commit is contained in:
Éric Gaspar 2023-05-22 17:59:33 +02:00
parent a7314aed1b
commit 782b589bd1
2 changed files with 190 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

170
conf/SCHEMA.sql
View file

@ -21,14 +21,14 @@ CREATE TABLE `customers` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`title` varchar(128) NOT NULL DEFAULT '', `title` varchar(128) NOT NULL DEFAULT '',
`address` varchar(255) DEFAULT NULL, `address` varchar(255) DEFAULT NULL,
`postcode` int(8) DEFAULT NULL, `postcode` VARCHAR(32) NULL DEFAULT NULL,
`city` varchar(255) DEFAULT NULL, `city` varchar(255) DEFAULT NULL,
`state` varchar(255) DEFAULT NULL, `state` varchar(255) DEFAULT NULL,
`lat` varchar(12) DEFAULT NULL, `lat` varchar(31) DEFAULT NULL,
`long` varchar(12) DEFAULT NULL, `long` varchar(31) DEFAULT NULL,
`contact_person` text DEFAULT NULL, `contact_person` text DEFAULT NULL,
`contact_phone` varchar(32) DEFAULT NULL, `contact_phone` varchar(32) DEFAULT NULL,
`contact_mail` varchar(255) DEFAULT NULL, `contact_mail` varchar(254) DEFAULT NULL,
`note` text DEFAULT NULL, `note` text DEFAULT NULL,
`status` set('Active','Reserved','Inactive') DEFAULT 'Active', `status` set('Active','Reserved','Inactive') DEFAULT 'Active',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
@ -44,7 +44,7 @@ CREATE TABLE `ipaddresses` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`subnetId` INT(11) UNSIGNED NULL DEFAULT NULL, `subnetId` INT(11) UNSIGNED NULL DEFAULT NULL,
`ip_addr` varchar(100) NOT NULL, `ip_addr` varchar(100) NOT NULL,
`is_gateway` TINYINT(1) NULL DEFAULT '0', `is_gateway` BOOL NOT NULL DEFAULT '0',
`description` varchar(64) DEFAULT NULL, `description` varchar(64) DEFAULT NULL,
`hostname` varchar(255) DEFAULT NULL, `hostname` varchar(255) DEFAULT NULL,
`mac` varchar(20) DEFAULT NULL, `mac` varchar(20) DEFAULT NULL,
@ -55,8 +55,8 @@ CREATE TABLE `ipaddresses` (
`port` varchar(32) DEFAULT NULL, `port` varchar(32) DEFAULT NULL,
`note` text, `note` text,
`lastSeen` DATETIME NULL DEFAULT '1970-01-01 00:00:01', `lastSeen` DATETIME NULL DEFAULT '1970-01-01 00:00:01',
`excludePing` BINARY NULL DEFAULT '0', `excludePing` BOOL NOT NULL DEFAULT '0',
`PTRignore` BINARY NULL DEFAULT '0', `PTRignore` BOOL NOT NULL DEFAULT '0',
`PTR` INT(11) UNSIGNED NULL DEFAULT '0', `PTR` INT(11) UNSIGNED NULL DEFAULT '0',
`firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL, `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL,
`editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP, `editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP,
@ -93,8 +93,8 @@ CREATE TABLE `logs` (
`date` varchar(32) DEFAULT NULL, `date` varchar(32) DEFAULT NULL,
`username` varchar(255) DEFAULT NULL, `username` varchar(255) DEFAULT NULL,
`ipaddr` varchar(64) DEFAULT NULL, `ipaddr` varchar(64) DEFAULT NULL,
`command` varchar(128) DEFAULT '0', `command` text DEFAULT NULL,
`details` varchar(1024) DEFAULT NULL, `details` text DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -108,6 +108,7 @@ CREATE TABLE `requests` (
`subnetId` INT(11) UNSIGNED NULL DEFAULT NULL, `subnetId` INT(11) UNSIGNED NULL DEFAULT NULL,
`ip_addr` varchar(100) DEFAULT NULL, `ip_addr` varchar(100) DEFAULT NULL,
`description` varchar(64) DEFAULT NULL, `description` varchar(64) DEFAULT NULL,
`mac` varchar(20) DEFAULT NULL,
`hostname` varchar(255) DEFAULT NULL, `hostname` varchar(255) DEFAULT NULL,
`state` INT NULL DEFAULT '2', `state` INT NULL DEFAULT '2',
`owner` varchar(128) DEFAULT NULL, `owner` varchar(128) DEFAULT NULL,
@ -134,6 +135,7 @@ CREATE TABLE `sections` (
`subnetOrdering` VARCHAR(16) NULL DEFAULT NULL, `subnetOrdering` VARCHAR(16) NULL DEFAULT NULL,
`order` INT(3) NULL DEFAULT NULL, `order` INT(3) NULL DEFAULT NULL,
`editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP, `editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP,
`showSubnet` BOOL NOT NULL DEFAULT '1',
`showVLAN` BOOL NOT NULL DEFAULT '0', `showVLAN` BOOL NOT NULL DEFAULT '0',
`showVRF` BOOL NOT NULL DEFAULT '0', `showVRF` BOOL NOT NULL DEFAULT '0',
`showSupernetOnly` BOOL NOT NULL DEFAULT '0', `showSupernetOnly` BOOL NOT NULL DEFAULT '0',
@ -156,7 +158,7 @@ CREATE TABLE `settings` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`siteTitle` varchar(64) DEFAULT NULL, `siteTitle` varchar(64) DEFAULT NULL,
`siteAdminName` varchar(64) DEFAULT NULL, `siteAdminName` varchar(64) DEFAULT NULL,
`siteAdminMail` varchar(64) DEFAULT NULL, `siteAdminMail` varchar(254) DEFAULT NULL,
`siteDomain` varchar(32) DEFAULT NULL, `siteDomain` varchar(32) DEFAULT NULL,
`siteURL` varchar(64) DEFAULT NULL, `siteURL` varchar(64) DEFAULT NULL,
`siteLoginText` varchar(128) DEFAULT NULL, `siteLoginText` varchar(128) DEFAULT NULL,
@ -179,6 +181,7 @@ CREATE TABLE `settings` (
`enablePSTN` TINYINT(1) NULL DEFAULT '0', `enablePSTN` TINYINT(1) NULL DEFAULT '0',
`enableChangelog` TINYINT(1) NOT NULL DEFAULT '1', `enableChangelog` TINYINT(1) NOT NULL DEFAULT '1',
`enableCustomers` TINYINT(1) NOT NULL DEFAULT '1', `enableCustomers` TINYINT(1) NOT NULL DEFAULT '1',
`enableVaults` TINYINT(1) NOT NULL DEFAULT '1',
`link_field` VARCHAR(32) NULL DEFAULT '0', `link_field` VARCHAR(32) NULL DEFAULT '0',
`version` varchar(5) DEFAULT NULL, `version` varchar(5) DEFAULT NULL,
`dbversion` INT(8) NOT NULL DEFAULT '0', `dbversion` INT(8) NOT NULL DEFAULT '0',
@ -199,9 +202,9 @@ CREATE TABLE `settings` (
`api` BINARY NOT NULL DEFAULT '0', `api` BINARY NOT NULL DEFAULT '0',
`scanPingPath` VARCHAR(64) NULL DEFAULT '/bin/ping', `scanPingPath` VARCHAR(64) NULL DEFAULT '/bin/ping',
`scanFPingPath` VARCHAR(64) NULL DEFAULT '/bin/fping', `scanFPingPath` VARCHAR(64) NULL DEFAULT '/bin/fping',
`scanPingType` SET('ping','pear','fping') NOT NULL DEFAULT 'ping', `scanPingType` ENUM('none','ping','pear','fping') NOT NULL DEFAULT 'ping',
`scanMaxThreads` INT(4) NULL DEFAULT '128', `scanMaxThreads` INT(4) NULL DEFAULT '128',
`prettyLinks` SET("Yes","No") NOT NULL DEFAULT 'No', `prettyLinks` ENUM('Yes','No') NOT NULL DEFAULT 'No',
`hiddenCustomFields` text NULL, `hiddenCustomFields` text NULL,
`inactivityTimeout` INT(5) NOT NULL DEFAULT '3600', `inactivityTimeout` INT(5) NOT NULL DEFAULT '3600',
`updateTags` TINYINT(1) NULL DEFAULT '0', `updateTags` TINYINT(1) NULL DEFAULT '0',
@ -211,13 +214,13 @@ CREATE TABLE `settings` (
`decodeMAC` TINYINT(1) NULL DEFAULT '1', `decodeMAC` TINYINT(1) NULL DEFAULT '1',
`tempShare` TINYINT(1) NULL DEFAULT '0', `tempShare` TINYINT(1) NULL DEFAULT '0',
`tempAccess` TEXT NULL, `tempAccess` TEXT NULL,
`log` SET('Database','syslog', 'both') NOT NULL DEFAULT 'Database', `log` ENUM('Database','syslog', 'both') NOT NULL DEFAULT 'Database',
`subnetView` TINYINT NOT NULL DEFAULT '0', `subnetView` TINYINT NOT NULL DEFAULT '0',
`enableCircuits` TINYINT(1) NULL DEFAULT '1', `enableCircuits` TINYINT(1) NULL DEFAULT '1',
`enableRouting` TINYINT(1) NULL DEFAULT '0', `enableRouting` TINYINT(1) NULL DEFAULT '0',
`permissionPropagate` TINYINT(1) NULL DEFAULT '1', `permissionPropagate` TINYINT(1) NULL DEFAULT '1',
`passwordPolicy` VARCHAR(1024) NULL DEFAULT '{\"minLength\":8,\"maxLength\":0,\"minNumbers\":0,\"minLetters\":0,\"minLowerCase\":0,\"minUpperCase\":0,\"minSymbols\":0,\"maxSymbols\":0,\"allowedSymbols\":\"#,_,-,!,[,],=,~\"}', `passwordPolicy` VARCHAR(1024) NULL DEFAULT '{\"minLength\":8,\"maxLength\":0,\"minNumbers\":0,\"minLetters\":0,\"minLowerCase\":0,\"minUpperCase\":0,\"minSymbols\":0,\"maxSymbols\":0,\"allowedSymbols\":\"#,_,-,!,[,],=,~\"}',
`2fa_provider` SET('none','Google_Authenticator') NULL DEFAULT 'none', `2fa_provider` ENUM('none','Google_Authenticator') NULL DEFAULT 'none',
`2fa_name` VARCHAR(32) NULL DEFAULT 'phpipam', `2fa_name` VARCHAR(32) NULL DEFAULT 'phpipam',
`2fa_length` INT(2) NULL DEFAULT '16', `2fa_length` INT(2) NULL DEFAULT '16',
`2fa_userchange` BOOL NOT NULL DEFAULT '1', `2fa_userchange` BOOL NOT NULL DEFAULT '1',
@ -235,15 +238,15 @@ DROP TABLE IF EXISTS `settingsMail`;
CREATE TABLE `settingsMail` ( CREATE TABLE `settingsMail` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`mtype` set('localhost','smtp') NOT NULL DEFAULT 'localhost', `mtype` ENUM('localhost','smtp') NOT NULL DEFAULT 'localhost',
`msecure` SET('none','ssl','tls') NOT NULL DEFAULT 'none', `msecure` ENUM('none','ssl','tls') NOT NULL DEFAULT 'none',
`mauth` set('yes','no') NOT NULL DEFAULT 'no', `mauth` ENUM('yes','no') NOT NULL DEFAULT 'no',
`mserver` varchar(128) DEFAULT NULL, `mserver` varchar(128) DEFAULT NULL,
`mport` int(5) DEFAULT '25', `mport` int(5) DEFAULT '25',
`muser` varchar(64) DEFAULT NULL, `muser` varchar(254) DEFAULT NULL,
`mpass` varchar(64) DEFAULT NULL, `mpass` varchar(128) DEFAULT NULL,
`mAdminName` varchar(64) DEFAULT NULL, `mAdminName` varchar(128) DEFAULT NULL,
`mAdminMail` varchar(64) DEFAULT NULL, `mAdminMail` varchar(254) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/* insert default values */ /* insert default values */
@ -266,21 +269,22 @@ CREATE TABLE `subnets` (
`firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL, `firewallAddressObject` VARCHAR(100) NULL DEFAULT NULL,
`vrfId` INT(11) UNSIGNED NULL DEFAULT NULL, `vrfId` INT(11) UNSIGNED NULL DEFAULT NULL,
`masterSubnetId` INT(11) UNSIGNED NOT NULL default 0, `masterSubnetId` INT(11) UNSIGNED NOT NULL default 0,
`allowRequests` tinyint(1) DEFAULT '0', `allowRequests` BOOL NOT NULL DEFAULT '0',
`vlanId` INT(11) UNSIGNED NULL DEFAULT NULL, `vlanId` INT(11) UNSIGNED NULL DEFAULT NULL,
`showName` tinyint(1) DEFAULT '0', `showName` BOOL NOT NULL DEFAULT '0',
`device` INT UNSIGNED NULL DEFAULT '0', `device` INT UNSIGNED NULL DEFAULT '0',
`permissions` varchar(1024) DEFAULT NULL, `permissions` varchar(1024) DEFAULT NULL,
`pingSubnet` BOOL NULL DEFAULT '0', `pingSubnet` BOOL NOT NULL DEFAULT '0',
`discoverSubnet` BINARY(1) NULL DEFAULT '0', `discoverSubnet` BOOL NOT NULL DEFAULT '0',
`resolveDNS` TINYINT(1) NULL DEFAULT '0', `resolveDNS` BOOL NOT NULL DEFAULT '0',
`DNSrecursive` TINYINT(1) NULL DEFAULT '0', `DNSrecursive` BOOL NOT NULL DEFAULT '0',
`DNSrecords` TINYINT(1) NULL DEFAULT '0', `DNSrecords` BOOL NOT NULL DEFAULT '0',
`nameserverId` INT(11) NULL DEFAULT '0', `nameserverId` INT(11) NULL DEFAULT '0',
`scanAgent` INT(11) DEFAULT NULL, `scanAgent` INT(11) DEFAULT NULL,
`customer_id` INT(11) unsigned NULL default NULL, `customer_id` INT(11) unsigned NULL default NULL,
`isFolder` BOOL NULL DEFAULT '0', `isFolder` BOOL NOT NULL DEFAULT '0',
`isFull` TINYINT(1) NULL DEFAULT '0', `isFull` BOOL NOT NULL DEFAULT '0',
`isPool` BOOL NOT NULL DEFAULT '0',
`state` INT(3) NULL DEFAULT '2', `state` INT(3) NULL DEFAULT '2',
`threshold` int(3) NULL DEFAULT 0, `threshold` int(3) NULL DEFAULT 0,
`location` INT(11) UNSIGNED NULL DEFAULT NULL, `location` INT(11) UNSIGNED NULL DEFAULT NULL,
@ -370,28 +374,28 @@ CREATE TABLE `users` (
`groups` varchar(1024) COLLATE utf8_bin DEFAULT NULL, `groups` varchar(1024) COLLATE utf8_bin DEFAULT NULL,
`role` text CHARACTER SET utf8, `role` text CHARACTER SET utf8,
`real_name` varchar(128) CHARACTER SET utf8 DEFAULT NULL, `real_name` varchar(128) CHARACTER SET utf8 DEFAULT NULL,
`email` varchar(64) CHARACTER SET utf8 DEFAULT NULL, `email` varchar(254) CHARACTER SET utf8 DEFAULT NULL,
`domainUser` binary(1) DEFAULT '0', `domainUser` binary(1) DEFAULT '0',
`widgets` VARCHAR(1024) NULL DEFAULT 'statistics;favourite_subnets;changelog;top10_hosts_v4', `widgets` VARCHAR(1024) NULL DEFAULT 'statistics;favourite_subnets;changelog;top10_hosts_v4',
`lang` INT(11) UNSIGNED NULL DEFAULT '9', `lang` INT(11) UNSIGNED NULL DEFAULT '9',
`favourite_subnets` VARCHAR(1024) NULL DEFAULT NULL, `favourite_subnets` VARCHAR(1024) NULL DEFAULT NULL,
`disabled` SET('Yes','No') NOT NULL DEFAULT 'No', `disabled` ENUM('Yes','No') NOT NULL DEFAULT 'No',
`mailNotify` SET('Yes','No') NULL DEFAULT 'No', `mailNotify` ENUM('Yes','No') NOT NULL DEFAULT 'No',
`mailChangelog` SET('Yes','No') NULL DEFAULT 'No', `mailChangelog` ENUM('Yes','No') NOT NULL DEFAULT 'No',
`passChange` SET('Yes','No') NOT NULL DEFAULT 'No', `passChange` ENUM('Yes','No') NOT NULL DEFAULT 'No',
`editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP, `editDate` TIMESTAMP NULL ON UPDATE CURRENT_TIMESTAMP,
`lastLogin` TIMESTAMP NULL, `lastLogin` TIMESTAMP NULL,
`lastActivity` TIMESTAMP NULL, `lastActivity` TIMESTAMP NULL,
`compressOverride` SET('default','Uncompress') NOT NULL DEFAULT 'default', `compressOverride` ENUM('default','Uncompress') NOT NULL DEFAULT 'default',
`hideFreeRange` tinyint(1) DEFAULT '0', `hideFreeRange` tinyint(1) DEFAULT '0',
`menuType` SET('Static','Dynamic') NULL DEFAULT 'Dynamic', `menuType` ENUM('Static','Dynamic') NOT NULL DEFAULT 'Dynamic',
`menuCompact` TINYINT NULL DEFAULT '1', `menuCompact` TINYINT NULL DEFAULT '1',
`2fa` BOOL NOT NULL DEFAULT '0', `2fa` BOOL NOT NULL DEFAULT '0',
`2fa_secret` VARCHAR(32) NULL DEFAULT NULL, `2fa_secret` VARCHAR(32) NULL DEFAULT NULL,
`theme` VARCHAR(32) NULL DEFAULT '', `theme` VARCHAR(32) NULL DEFAULT '',
`token` VARCHAR(24) NULL DEFAULT NULL, `token` VARCHAR(24) NULL DEFAULT NULL,
`token_valid_until` DATETIME NULL, `token_valid_until` DATETIME NULL,
`module_permissions` varchar(255) COLLATE utf8_bin DEFAULT '{"vlan":"1","vrf":"1","pdns":"1","circuits":"1","racks":"1","nat":"1","pstn":"1","customers":"1","locations":"1","devices":"1"}', `module_permissions` varchar(255) COLLATE utf8_bin DEFAULT '{"vlan":"1","l2dom":"1","vrf":"1","pdns":"1","circuits":"1","racks":"1","nat":"1","pstn":"1","customers":"1","locations":"1","devices":"1","routing":"1","vaults":"1"}',
`compress_actions` TINYINT(1) NULL DEFAULT '1', `compress_actions` TINYINT(1) NULL DEFAULT '1',
PRIMARY KEY (`username`), PRIMARY KEY (`username`),
UNIQUE KEY `id_2` (`id`) UNIQUE KEY `id_2` (`id`)
@ -424,9 +428,11 @@ VALUES
(7, 'es_ES.UTF-8', 'Español'), (7, 'es_ES.UTF-8', 'Español'),
(8, 'cs_CZ.UTF-8', 'Czech'), (8, 'cs_CZ.UTF-8', 'Czech'),
(9, 'en_US.UTF-8', 'English (US)'), (9, 'en_US.UTF-8', 'English (US)'),
(10,'ru_RU.UTF-8', 'Russian'), (10, 'ru_RU.UTF-8', 'Russian'),
(11,'zh_CN.UTF-8', 'Chinese'), (11, 'zh_CN.UTF-8', 'Chinese'),
(12,'ja_JP.UTF-8', 'Japanese'); (12, 'ja_JP.UTF-8', 'Japanese'),
(13, 'zh_TW.UTF-8', 'Chinese traditional (繁體中文)'),
(14, 'it_IT.UTF-8', 'Italian');
# Dump of table vlans # Dump of table vlans
@ -536,10 +542,10 @@ CREATE TABLE `changelog` (
`ctype` set('ip_addr','subnet','section') NOT NULL DEFAULT '', `ctype` set('ip_addr','subnet','section') NOT NULL DEFAULT '',
`coid` int(11) unsigned NOT NULL, `coid` int(11) unsigned NOT NULL,
`cuser` int(11) unsigned NOT NULL, `cuser` int(11) unsigned NOT NULL,
`caction` set('add','edit','delete','truncate','resize','perm_change') NOT NULL DEFAULT 'edit', `caction` ENUM('add','edit','delete','truncate','resize','perm_change') NOT NULL DEFAULT 'edit',
`cresult` set('error','success') NOT NULL DEFAULT '', `cresult` ENUM('error','success') NOT NULL DEFAULT 'success',
`cdate` datetime NOT NULL, `cdate` datetime NOT NULL,
`cdiff` varchar(2048) DEFAULT NULL, `cdiff` text DEFAULT NULL,
PRIMARY KEY (`cid`), PRIMARY KEY (`cid`),
KEY `coid` (`coid`), KEY `coid` (`coid`),
KEY `ctype` (`ctype`) KEY `ctype` (`ctype`)
@ -582,7 +588,8 @@ VALUES
(15, 'Locations', 'Shows map of locations', 'locations', NULL, 'yes', '6', 'no', 'yes'), (15, 'Locations', 'Shows map of locations', 'locations', NULL, 'yes', '6', 'no', 'yes'),
(16, 'Bandwidth calculator', 'Calculate bandwidth', 'bw_calculator', NULL, 'no', '6', 'no', 'yes'), (16, 'Bandwidth calculator', 'Calculate bandwidth', 'bw_calculator', NULL, 'no', '6', 'no', 'yes'),
(17, 'Customers', 'Shows customer list', 'customers', NULL, 'yes', '6', 'no', 'yes'), (17, 'Customers', 'Shows customer list', 'customers', NULL, 'yes', '6', 'no', 'yes'),
(18, 'User Instructions', 'Shows user instructions', 'instructions', NULL, 'yes', '6', 'no', 'yes'); (18, 'User Instructions', 'Shows user instructions', 'instructions', NULL, 'yes', '6', 'no', 'yes'),
(19, 'MAC lookup', 'Shows MAC address vendor', 'mac-lookup', NULL, 'yes', '6', 'no', 'yes');
@ -630,9 +637,9 @@ DROP TABLE IF EXISTS `usersAuthMethod`;
CREATE TABLE `usersAuthMethod` ( CREATE TABLE `usersAuthMethod` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT, `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`type` set('local','http','AD','LDAP','NetIQ','Radius','SAML2') NOT NULL DEFAULT 'local', `type` ENUM('local','http','AD','LDAP','NetIQ','Radius','SAML2') NOT NULL DEFAULT 'local',
`params` varchar(2048) DEFAULT NULL, `params` text DEFAULT NULL,
`protected` set('Yes','No') NOT NULL DEFAULT 'Yes', `protected` ENUM('Yes','No') NOT NULL DEFAULT 'Yes',
`description` text, `description` text,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -709,6 +716,7 @@ DROP TABLE IF EXISTS `firewallZoneSubnet`;
CREATE TABLE `firewallZoneSubnet` ( CREATE TABLE `firewallZoneSubnet` (
`zoneId` INT NOT NULL, `zoneId` INT NOT NULL,
`subnetId` INT(11) NOT NULL, `subnetId` INT(11) NOT NULL,
PRIMARY KEY (`zoneId`,`subnetId`),
INDEX `fk_zoneId_idx` (`zoneId` ASC), INDEX `fk_zoneId_idx` (`zoneId` ASC),
INDEX `fk_subnetId_idx` (`subnetId` ASC), INDEX `fk_subnetId_idx` (`subnetId` ASC),
CONSTRAINT `fk_zoneId` CONSTRAINT `fk_zoneId`
@ -807,8 +815,8 @@ CREATE TABLE `locations` (
`name` varchar(128) NOT NULL DEFAULT '', `name` varchar(128) NOT NULL DEFAULT '',
`description` text, `description` text,
`address` VARCHAR(128) NULL DEFAULT NULL, `address` VARCHAR(128) NULL DEFAULT NULL,
`lat` varchar(12) DEFAULT NULL, `lat` varchar(31) DEFAULT NULL,
`long` varchar(12) DEFAULT NULL, `long` varchar(31) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -913,7 +921,8 @@ DROP TABLE IF EXISTS `circuitsLogicalMapping`;
CREATE TABLE `circuitsLogicalMapping` ( CREATE TABLE `circuitsLogicalMapping` (
`logicalCircuit_id` int(11) unsigned NOT NULL, `logicalCircuit_id` int(11) unsigned NOT NULL,
`circuit_id` int(11) unsigned NOT NULL, `circuit_id` int(11) unsigned NOT NULL,
`order` int(10) unsigned DEFAULT NULL `order` int(10) unsigned DEFAULT NULL,
PRIMARY KEY (`logicalCircuit_id`, `circuit_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@ -990,9 +999,64 @@ CREATE TABLE `routing_subnets` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8; ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
# Dump of table vaults
# ------------------------------------------------------------
DROP TABLE IF EXISTS `vaults`;
CREATE TABLE `vaults` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`name` varchar(64) NOT NULL DEFAULT '',
`type` enum('passwords','certificates') NOT NULL DEFAULT 'passwords',
`description` text,
`test` char(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
# Dump of table vaultItems
# ------------------------------------------------------------
DROP TABLE IF EXISTS `vaultItems`;
CREATE TABLE `vaultItems` (
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
`vaultId` int(11) unsigned NOT NULL,
`type` enum('password','certificate') NOT NULL DEFAULT 'password',
`type_certificate` enum('public','pkcs12','certificate','website') NOT NULL DEFAULT 'public',
`values` text,
PRIMARY KEY (`id`),
KEY `vaultId` (`vaultId`),
CONSTRAINT `vaultItems_ibfk_1` FOREIGN KEY (`vaultId`) REFERENCES `vaults` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
# Dump of table nominatim
# ------------------------------------------------------------
DROP TABLE IF EXISTS `nominatim`;
CREATE TABLE `nominatim` (
`id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
`url` varchar(255) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
/* insert default values */
INSERT INTO `nominatim` (`id`, `url`) VALUES (1, 'https://nominatim.openstreetmap.org/search');
# Dump of table nominatim_cache
# ------------------------------------------------------------
DROP TABLE IF EXISTS `nominatim_cache`;
CREATE TABLE `nominatim_cache` (
`sha256` binary(32) NOT NULL,
`date` timestamp NOT NULL DEFAULT current_timestamp(),
`query` text NOT NULL,
`lat_lng` text NOT NULL,
PRIMARY KEY (`sha256`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
# Dump of table -- for autofix comment, leave as it is # Dump of table -- for autofix comment, leave as it is
# ------------------------------------------------------------ # ------------------------------------------------------------
UPDATE `settings` SET `version` = "1.43"; UPDATE `settings` SET `version` = "1.52";
UPDATE `settings` SET `dbversion` = 25; UPDATE `settings` SET `dbversion` = 39;

6
conf/nginx.conf
View file

@ -7,7 +7,7 @@ location __PATH__/ {
index index.php; index index.php;
client_max_body_size 256M; client_max_body_size 256M;
try_files $uri $uri/ index.php; try_files $uri $uri/ __PATH__/index.php;
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
@ -23,3 +23,7 @@ location __PATH__/ {
# Include SSOWAT user panel. # Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }
location __PATH__/api/ {
try_files $uri $uri/ __PATH__/api/index.php;
}