mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-07-29 08:44:10 +02:00
Update documentation and fix vagrant manifest due to moved schema files
This commit is contained in:
parent
abc34a5f1a
commit
8f787e649c
@ -601,27 +601,15 @@ exec { 'create-pgsql-icingaweb-db':
|
|||||||
require => Service['postgresql']
|
require => Service['postgresql']
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { 'populate-icingaweb-mysql-db-accounts':
|
exec { 'populate-icingaweb-mysql-db-tables':
|
||||||
unless => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM account;" &> /dev/null',
|
unless => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM account;" &> /dev/null',
|
||||||
command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/accounts.mysql.sql',
|
command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/mysql.sql',
|
||||||
require => [ Exec['create-mysql-icingaweb-db'] ]
|
require => [ Exec['create-mysql-icingaweb-db'] ]
|
||||||
}
|
}
|
||||||
|
|
||||||
exec { 'populate-icingweba-pgsql-db-accounts':
|
exec { 'populate-icingweba-pgsql-db-tables':
|
||||||
unless => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM account;" &> /dev/null',
|
unless => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM account;" &> /dev/null',
|
||||||
command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/accounts.pgsql.sql',
|
command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/pgsql.sql',
|
||||||
require => [ Exec['create-pgsql-icingaweb-db'] ]
|
|
||||||
}
|
|
||||||
|
|
||||||
exec { 'populate-icingaweb-mysql-db-preferences':
|
|
||||||
unless => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM preference;" &> /dev/null',
|
|
||||||
command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/preferences.mysql.sql',
|
|
||||||
require => [ Exec['create-mysql-icingaweb-db'] ]
|
|
||||||
}
|
|
||||||
|
|
||||||
exec { 'populate-icingweba-pgsql-db-preferences':
|
|
||||||
unless => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM preference;" &> /dev/null',
|
|
||||||
command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/preferences.pgsql.sql',
|
|
||||||
require => [ Exec['create-pgsql-icingaweb-db'] ]
|
require => [ Exec['create-pgsql-icingaweb-db'] ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,8 +74,7 @@ create all database tables. You will find the installation guides for the differ
|
|||||||
>
|
>
|
||||||
> RPM packages install the schema into /usr/share/doc/icingaweb-<version>/schema
|
> RPM packages install the schema into /usr/share/doc/icingaweb-<version>/schema
|
||||||
|
|
||||||
bash$ mysql -u root -p icingaweb < etc/schema/accounts.mysql.sql
|
bash$ mysql -u root -p icingaweb < etc/schema/mysql.sql
|
||||||
bash$ mysql -u root -p icingaweb < etc/schema/preferences.mysql.sql
|
|
||||||
|
|
||||||
|
|
||||||
#### PostgreSQL
|
#### PostgreSQL
|
||||||
@ -108,8 +107,7 @@ And restart your database ('service postgresql restart' or '/etc/init.d/postgres
|
|||||||
>
|
>
|
||||||
> RPM packages install the schema into /usr/share/doc/icingaweb-<version>/schema
|
> RPM packages install the schema into /usr/share/doc/icingaweb-<version>/schema
|
||||||
|
|
||||||
bash$ psql -U icingaweb -a -f etc/schema/accounts.pgsql.sql
|
bash$ psql -U icingaweb -a -f etc/schema/pgsql.sql
|
||||||
bash$ psql -U icingaweb -a -f etc/schema/preferences.pgsql.sql
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,8 +42,7 @@ Decide whether to use MySQL or PostgreSQL.
|
|||||||
FLUSH PRIVILEGES;
|
FLUSH PRIVILEGES;
|
||||||
quit
|
quit
|
||||||
|
|
||||||
mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/accounts.mysql.sql
|
mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/mysql.sql
|
||||||
mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/preferences.mysql.sql
|
|
||||||
|
|
||||||
### PostgreSQL
|
### PostgreSQL
|
||||||
|
|
||||||
@ -62,8 +61,7 @@ in `/var/lib/pgsql/data/pg_hba.conf` and restart the PostgreSQL server.
|
|||||||
|
|
||||||
Now install the `icingaweb` schema
|
Now install the `icingaweb` schema
|
||||||
|
|
||||||
bash$ psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/accounts.pgsql.sql
|
bash$ psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/pgsql.sql
|
||||||
bash$ psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/preferences.pgsql.sql
|
|
||||||
|
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
Loading…
x
Reference in New Issue
Block a user