Skip to content

Commit bda5d27

Browse files
author
Marius Burkard
committed
- fixed missing entries in distribution config files
1 parent 8970d37 commit bda5d27

12 files changed

+32
-19
lines changed

install/dist/conf/centos70.conf.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
$conf['services']['dns'] = true;
5151
$conf['services']['file'] = true;
5252
$conf['services']['db'] = true;
53+
$conf['services']['proxy'] = false;
54+
$conf['services']['firewall'] = false;
5355

5456
//* MySQL
5557
$conf['mysql']['installed'] = false; // will be detected automatically during installation
@@ -185,6 +187,10 @@
185187
$conf['nginx']['php_fpm_start_port'] = 9010;
186188
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
187189

190+
//*Bastille-Firwall
191+
$conf['bastille']['installed'] = false;
192+
$conf['bastille']['config_dir'] = '/etc/Bastille';
193+
188194
//* vlogger
189195
$conf['vlogger']['config_dir'] = '/etc';
190196

install/dist/conf/centos72.conf.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
$conf['services']['dns'] = true;
5151
$conf['services']['file'] = true;
5252
$conf['services']['db'] = true;
53+
$conf['services']['proxy'] = false;
54+
$conf['services']['firewall'] = false;
5355

5456
//* MySQL
5557
$conf['mysql']['installed'] = false; // will be detected automatically during installation
@@ -185,6 +187,10 @@
185187
$conf['nginx']['php_fpm_start_port'] = 9010;
186188
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
187189

190+
//*Bastille-Firwall
191+
$conf['bastille']['installed'] = false;
192+
$conf['bastille']['config_dir'] = '/etc/Bastille';
193+
188194
//* vlogger
189195
$conf['vlogger']['config_dir'] = '/etc';
190196

install/dist/conf/debian40.conf.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
//* PowerDNS
147147
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
148148
$conf['powerdns']['database'] = 'powerdns';
149-
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
149+
$conf['powerdns']['config_dir'] = '/etc/powerdns/pdns.d';
150150
$conf['powerdns']['init_script'] = 'pdns';
151151

152152
//* BIND DNS Server
@@ -191,7 +191,6 @@
191191
$conf['bastille']['installed'] = false;
192192
$conf['bastille']['config_dir'] = '/etc/Bastille';
193193

194-
195194
//* vlogger
196195
$conf['vlogger']['config_dir'] = '/etc';
197196

install/dist/conf/debian60.conf.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,3 @@
198198
$conf['cron']['init_script'] = 'cron';
199199
$conf['cron']['crontab_dir'] = '/etc/cron.d';
200200
$conf['cron']['wget'] = '/usr/bin/wget';
201-
202-
203-
?>

install/dist/conf/debian90.conf.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,5 +198,3 @@
198198
$conf['cron']['init_script'] = 'cron';
199199
$conf['cron']['crontab_dir'] = '/etc/cron.d';
200200
$conf['cron']['wget'] = '/usr/bin/wget';
201-
202-
?>

install/dist/conf/debiantesting.conf.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
//* PowerDNS
147147
$conf['powerdns']['installed'] = false; // will be detected automatically during installation
148148
$conf['powerdns']['database'] = 'powerdns';
149-
$conf["powerdns"]["config_dir"] = '/etc/powerdns/pdns.d';
149+
$conf['powerdns']['config_dir'] = '/etc/powerdns/pdns.d';
150150
$conf['powerdns']['init_script'] = 'pdns';
151151

152152
//* BIND DNS Server
@@ -198,6 +198,3 @@
198198
$conf['cron']['init_script'] = 'cron';
199199
$conf['cron']['crontab_dir'] = '/etc/cron.d';
200200
$conf['cron']['wget'] = '/usr/bin/wget';
201-
202-
203-
?>

install/dist/conf/fedora9.conf.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
$conf['services']['dns'] = true;
5151
$conf['services']['file'] = true;
5252
$conf['services']['db'] = true;
53+
$conf['services']['proxy'] = false;
54+
$conf['services']['firewall'] = false;
5355

5456
//* MySQL
5557
$conf['mysql']['installed'] = false; // will be detected automatically during installation
@@ -185,6 +187,10 @@
185187
$conf['nginx']['php_fpm_start_port'] = 9010;
186188
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
187189

190+
//*Bastille-Firwall
191+
$conf['bastille']['installed'] = false;
192+
$conf['bastille']['config_dir'] = '/etc/Bastille';
193+
188194
//* vlogger
189195
$conf['vlogger']['config_dir'] = '/etc';
190196

install/dist/conf/gentoo.conf.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
$conf['services']['dns'] = true;
5151
$conf['services']['file'] = true;
5252
$conf['services']['db'] = true;
53+
$conf['services']['proxy'] = false;
54+
$conf['services']['firewall'] = false;
5355

5456
//* MySQL
5557
$conf['mysql']['installed'] = false; // will be detected automatically during installation
@@ -197,6 +199,10 @@
197199
$conf['nginx']['php_fpm_start_port'] = 9010;
198200
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
199201

202+
//*Bastille-Firwall
203+
$conf['bastille']['installed'] = false;
204+
$conf['bastille']['config_dir'] = '/etc/Bastille';
205+
200206
//* vlogger
201207
$conf['vlogger']['config_dir'] = '/etc/vlogger';
202208

install/dist/conf/opensuse112.conf.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
$conf['services']['dns'] = true;
5151
$conf['services']['file'] = true;
5252
$conf['services']['db'] = true;
53+
$conf['services']['proxy'] = false;
54+
$conf['services']['firewall'] = false;
5355

5456
//* MySQL
5557
$conf['mysql']['installed'] = false; // will be detected automatically during installation
@@ -185,6 +187,10 @@
185187
$conf['nginx']['php_fpm_start_port'] = 9010;
186188
$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm';
187189

190+
//*Bastille-Firwall
191+
$conf['bastille']['installed'] = false;
192+
$conf['bastille']['config_dir'] = '/etc/Bastille';
193+
188194
//* vlogger
189195
$conf['vlogger']['config_dir'] = '/etc';
190196

install/dist/conf/ubuntu1604.conf.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,3 @@
198198
$conf['cron']['init_script'] = 'cron';
199199
$conf['cron']['crontab_dir'] = '/etc/cron.d';
200200
$conf['cron']['wget'] = '/usr/bin/wget';
201-
202-
203-
?>

0 commit comments

Comments
 (0)