Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
E
eonweb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Philipp STEINER
eonweb
Commits
d2906425
Commit
d2906425
authored
Jul 24, 2018
by
Bastien Pujos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Multiple fixes
parent
1292217a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
119 additions
and
96 deletions
+119
-96
appliance/configs.sql
appliance/configs.sql
+0
-5
appliance/langusers.sql
appliance/langusers.sql
+0
-1
appliance/ldapgroups.sql
appliance/ldapgroups.sql
+0
-10
appliance/nagiosbp.sql
appliance/nagiosbp.sql
+0
-69
appliance/updates/5.2.1.sql
appliance/updates/5.2.1.sql
+2
-0
appliance/updates/5.2.sql
appliance/updates/5.2.sql
+104
-5
include/function.php
include/function.php
+13
-6
No files found.
appliance/configs.sql
deleted
100644 → 0
View file @
1292217a
CREATE
TABLE
IF
NOT
EXISTS
configs
(
`name`
varchar
(
255
)
NOT
NULL
,
`value`
text
NOT
NULL
,
PRIMARY
KEY
(
`name`
)
);
appliance/langusers.sql
deleted
100644 → 0
View file @
1292217a
ALTER
TABLE
users
ADD
user_language
CHAR
(
2
)
DEFAULT
'0'
;
appliance/ldapgroups.sql
deleted
100644 → 0
View file @
1292217a
ALTER
TABLE
auth_settings
ADD
COLUMN
ldap_group_filter
varchar
(
255
);
ALTER
TABLE
auth_settings
CHANGE
ldap_filter
ldap_user_filter
varchar
(
255
);
ALTER
TABLE
groups
ADD
COLUMN
group_type
tinyint
(
1
);
ALTER
TABLE
groups
ADD
COLUMN
group_dn
varchar
(
255
);
CREATE
TABLE
`ldap_groups_extended`
(
`dn`
varchar
(
255
)
NOT
NULL
,
`group_name`
varchar
(
255
)
DEFAULT
NULL
,
`checked`
smallint
(
6
)
NOT
NULL
,
PRIMARY
KEY
(
`dn`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
appliance/nagiosbp.sql
deleted
100644 → 0
View file @
1292217a
-- MySQL dump 10.11
--
-- Host: localhost Database: nagiosbp
-- ------------------------------------------------------
-- Server version 5.0.95
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */
;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */
;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */
;
/*!40101 SET NAMES utf8 */
;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */
;
/*!40103 SET TIME_ZONE='+00:00' */
;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */
;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */
;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */
;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */
;
--
-- Table structure for table `bp`
--
DROP
TABLE
IF
EXISTS
`bp`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp`
(
`name`
varchar
(
255
)
NOT
NULL
,
`description`
varchar
(
255
)
default
NULL
,
`priority`
varchar
(
5
)
default
NULL
,
`type`
varchar
(
3
)
NOT
NULL
,
`command`
varchar
(
255
)
default
NULL
,
`url`
varchar
(
255
)
default
NULL
,
`min_value`
varchar
(
5
)
default
NULL
,
`is_define`
tinyint
(
1
)
default
'0'
,
PRIMARY
KEY
(
`name`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
--
-- Table structure for table `bp_links`
--
DROP
TABLE
IF
EXISTS
`bp_links`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp_links`
(
`id`
mediumint
(
9
)
NOT
NULL
auto_increment
,
`bp_name`
varchar
(
255
)
NOT
NULL
,
`bp_link`
varchar
(
255
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
--
-- Table structure for table `bp_services`
--
DROP
TABLE
IF
EXISTS
`bp_services`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp_services`
(
`id`
mediumint
(
9
)
NOT
NULL
auto_increment
,
`bp_name`
varchar
(
255
)
NOT
NULL
,
`host`
varchar
(
255
)
NOT
NULL
,
`service`
varchar
(
255
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
AUTO_INCREMENT
=
0
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
GRANT
ALL
ON
nagiosbp
.
*
TO
eonweb
@
localhost
IDENTIFIED
BY
'root66'
;
appliance/updates/5.2.1.sql
0 → 100644
View file @
d2906425
USE
notifier
;
ALTER
TABLE
rules
ADD
COLUMN
tracking
INT
(
11
)
NULL
DEFAULT
'0'
;
\ No newline at end of file
module/admin_notifier/db/notifier
.sql
→
appliance/updates/5.2
.sql
View file @
d2906425
-- MySQL dump 10.1
3 Distrib 5.1.73, for redhat-linux-gnu (x86_64)
-- MySQL dump 10.1
1
--
--
Host: localhost Database: notifier
-- ------------------------------------------------------
-- Server version 5.1.73
--
------------------------ DB nagiosbp ------------------------------
CREATE
DATABASE
IF
NOT
EXISTS
nagiosbp
;
USE
nagiosbp
;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */
;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */
;
...
...
@@ -15,6 +15,105 @@
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */
;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */
;
--
-- Table structure for table `bp`
--
DROP
TABLE
IF
EXISTS
`bp`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp`
(
`name`
varchar
(
255
)
NOT
NULL
,
`description`
varchar
(
255
)
default
NULL
,
`priority`
varchar
(
5
)
default
NULL
,
`type`
varchar
(
3
)
NOT
NULL
,
`command`
varchar
(
255
)
default
NULL
,
`url`
varchar
(
255
)
default
NULL
,
`min_value`
varchar
(
5
)
default
NULL
,
`is_define`
tinyint
(
1
)
default
'0'
,
PRIMARY
KEY
(
`name`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
--
-- Table structure for table `bp_links`
--
DROP
TABLE
IF
EXISTS
`bp_links`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp_links`
(
`id`
mediumint
(
9
)
NOT
NULL
auto_increment
,
`bp_name`
varchar
(
255
)
NOT
NULL
,
`bp_link`
varchar
(
255
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
--
-- Table structure for table `bp_services`
--
DROP
TABLE
IF
EXISTS
`bp_services`
;
/*!40101 SET @saved_cs_client = @@character_set_client */
;
/*!40101 SET character_set_client = utf8 */
;
CREATE
TABLE
`bp_services`
(
`id`
mediumint
(
9
)
NOT
NULL
auto_increment
,
`bp_name`
varchar
(
255
)
NOT
NULL
,
`host`
varchar
(
255
)
NOT
NULL
,
`service`
varchar
(
255
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
)
)
ENGINE
=
MyISAM
AUTO_INCREMENT
=
0
DEFAULT
CHARSET
=
latin1
;
/*!40101 SET character_set_client = @saved_cs_client */
;
GRANT
ALL
ON
nagiosbp
.
*
TO
eonweb
@
localhost
IDENTIFIED
BY
'root66'
;
-------------------------- DB eonweb ------------------------------
USE
eonweb
;
ALTER
TABLE
auth_settings
ADD
COLUMN
ldap_group_filter
varchar
(
255
);
ALTER
TABLE
auth_settings
CHANGE
ldap_filter
ldap_user_filter
varchar
(
255
);
ALTER
TABLE
groups
ADD
COLUMN
group_type
tinyint
(
1
);
ALTER
TABLE
groups
ADD
COLUMN
group_dn
varchar
(
255
);
--
-- Table structure for table `ldap_groups_extended`
--
CREATE
TABLE
`ldap_groups_extended`
(
`dn`
varchar
(
255
)
NOT
NULL
,
`group_name`
varchar
(
255
)
DEFAULT
NULL
,
`checked`
smallint
(
6
)
NOT
NULL
,
PRIMARY
KEY
(
`dn`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
latin1
;
ALTER
TABLE
users
ADD
user_language
CHAR
(
2
)
DEFAULT
'0'
;
CREATE
TABLE
IF
NOT
EXISTS
configs
(
`name`
varchar
(
255
)
NOT
NULL
,
`value`
text
NOT
NULL
,
PRIMARY
KEY
(
`name`
)
);
-------------------------- DB notifier ------------------------------
CREATE
DATABASE
IF
NOT
EXISTS
notifier
;
USE
notifier
;
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */
;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */
;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */
;
/*!40101 SET NAMES utf8 */
;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */
;
/*!40103 SET TIME_ZONE='+00:00' */
;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */
;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */
;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */
;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */
;
--
-- Table structure for table `configs`
--
...
...
@@ -128,7 +227,6 @@ CREATE TABLE `rules` (
`notificationnumber`
varchar
(
255
)
NOT
NULL
DEFAULT
'*'
,
`timeperiod_id`
bigint
unsigned
NOT
NULL
,
`sort_key`
int
(
32
)
NOT
NULL
default
0
,
`tracking`
INT
(
11
)
NULL
DEFAULT
'0'
,
PRIMARY
KEY
(
`id`
),
KEY
`timeperiod_id`
(
`timeperiod_id`
),
CONSTRAINT
`rules_ibfk_1`
FOREIGN
KEY
(
`timeperiod_id`
)
REFERENCES
`timeperiods`
(
`id`
)
...
...
@@ -182,3 +280,4 @@ UNLOCK TABLES;
-- Dump completed on 2017-03-13 15:55:32
GRANT
ALL
ON
notifier
.
*
TO
eonweb
@
localhost
IDENTIFIED
BY
'root66'
;
include/function.php
View file @
d2906425
...
...
@@ -1317,28 +1317,35 @@ function checkUpdateDB(){
global
$database_eonweb
;
global
$database_username
;
global
$database_password
;
global
$path_eonweb
;
$dir
=
$path_eonweb
.
"/appliance/updates/"
;
$version_sql
=
sqlrequest
(
$database_eonweb
,
"SELECT count(value) as value FROM configs WHERE name='version'"
);
if
(
mysqli_result
(
$version_sql
,
0
,
"value"
)
==
0
){
$version_sql
=
sqlrequest
(
$database_eonweb
,
"INSERT INTO configs (name, value) VALUES('version', '"
.
$version
.
"')"
);
// execution de tous les .sql jusqu'à la version donné dans config
exec
(
"ls /srv/eyesofnetwork/eonweb/appliance/updates/ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n"
,
$SQL_Files
);
$SQL_Files
=
array_slice
(
scandir
(
$dir
),
2
);
usort
(
$SQL_Files
,
'version_compare'
);
foreach
(
$SQL_Files
as
$file
){
echo
"mysql -u
$database_username
--password=
$database_password
< /srv/eyesofnetwork/eonweb/appliance/updates/
$file
"
;
exec
(
"mysql -u
$database_username
--password=
$database_password
< /srv/eyesofnetwork/eonweb/appliance/updates/
$file
"
);
if
(
rtrim
(
$file
,
'.sql'
)
<=
$version
){
exec
(
"mysql -u
$database_username
--password=
$database_password
<
$dir$file
"
);
}
}
}
else
{
$versionBD
=
mysqli_result
(
sqlrequest
(
$database_eonweb
,
"SELECT value FROM configs WHERE name='version'"
),
0
,
"value"
);
// execution des .sql entre version en BD et celle config
exec
(
"ls /srv/eyesofnetwork/eonweb/appliance/updates/ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n"
,
$SQL_Files
);
$SQL_Files
=
array_slice
(
scandir
(
$dir
),
2
);
usort
(
$SQL_Files
,
'version_compare'
);
foreach
(
$SQL_Files
as
$file
){
if
((
rtrim
(
$file
,
'.sql'
)
<=
$version
&&
rtrim
(
$file
,
'.sql'
)
>
$versionBD
)){
echo
"mysql -u
$database_username
--password=
$database_password
< /srv/eyesofnetwork/eonweb/appliance/updates/
$file
"
;
exec
(
"mysql -u
$database_username
--password=
$database_password
< /srv/eyesofnetwork/eonweb/appliance/updates/
$file
"
);
exec
(
"mysql -u
$database_username
--password=
$database_password
<
$dir$file
"
);
}
}
sqlrequest
(
$database_eonweb
,
"UPDATE configs SET value='
$version
' WHERE name='version'"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment