frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle configuration in a conflict-free way

Browse Source 
* config defaults in includes/defaults.php
* removed includes/config.php, added to gitignore
* during installation copy config/config.php
  to includes/config.php
This commit is contained in:
glaszig
2019-11-05 15:30:08 +01:00
parent c75788e31c
commit 313852a698
5 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,3 +2,4 @@
node_modules
yarn-error.log
*.swp
includes/config.php

0
includes/config.php → config/config.php
View File

50
includes/defaults.php Executable file
View File

@@ -0,0 +1,50 @@
<?php
if (!defined('RASPI_CONFIG')) {
define('RASPI_CONFIG', '/etc/raspap');
}
$defaults = [
'RASPI_VERSION' => '2.0',
'RASPI_CONFIG_NETWORKING' => RASPI_CONFIG.'/networking',
'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth',
'RASPI_WIFI_CLIENT_INTERFACE' => 'wlan0',
'RASPI_CACHE_PATH' => sys_get_temp_dir() . '/raspap',
// Constants for configuration file paths.
// These are typical for default RPi installs. Modify if needed.
'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.conf',
'RASPI_DNSMASQ_LEASES' => '/var/lib/misc/dnsmasq.leases',
'RASPI_HOSTAPD_CONFIG' => '/etc/hostapd/hostapd.conf',
'RASPI_DHCPCD_CONFIG' => '/etc/dhcpcd.conf',
'RASPI_WPA_SUPPLICANT_CONFIG' => '/etc/wpa_supplicant/wpa_supplicant.conf',
'RASPI_HOSTAPD_CTRL_INTERFACE' => '/var/run/hostapd',
'RASPI_WPA_CTRL_INTERFACE' => '/var/run/wpa_supplicant',
'RASPI_OPENVPN_CLIENT_CONFIG' => '/etc/openvpn/client.conf',
'RASPI_OPENVPN_SERVER_CONFIG' => '/etc/openvpn/server.conf',
'RASPI_TORPROXY_CONFIG' => '/etc/tor/torrc',
// Optional services, set to true to enable.
'RASPI_WIFICLIENT_ENABLED' => true,
'RASPI_HOTSPOT_ENABLED' => true,
'RASPI_NETWORK_ENABLED' => true,
'RASPI_DHCP_ENABLED' => true,
'RASPI_OPENVPN_ENABLED' => false,
'RASPI_TORPROXY_ENABLED' => false,
'RASPI_CONFAUTH_ENABLED' => true,
'RASPI_CHANGETHEME_ENABLED' => true,
'RASPI_VNSTAT_ENABLED' => true,
'RASPI_MONITOR_ENABLED' => false,
// Locale settings
'LOCALE_ROOT' => 'locale',
'LOCALE_DOMAIN' => 'messages'
];
foreach ($defaults as $setting => $value) {
if (!defined($setting)) {
define($setting, $value);
}
}
unset($defaults);

1
index.php
View File

@@ -22,6 +22,7 @@ require('includes/csrf.php');
ensureCSRFSessionToken();
include_once('includes/config.php');
include_once('includes/defaults.php');
include_once(RASPI_CONFIG.'/raspap.php');
include_once('includes/locale.php');
include_once('includes/functions.php');

4
installers/common.sh
View File

@@ -215,6 +215,10 @@ function default_configuration() {
sudo cp $webroot_dir/config/dnsmasq.conf /etc/dnsmasq.conf || install_error "Unable to move dnsmasq configuration file"
sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || install_error "Unable to move dhcpcd configuration file"
if [ ! -f "$webroot_dir/includes/config.php" ]; then
sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php"
fi
# Generate required lines for Rasp AP to place into rc.local file.
# #RASPAP is for removal script
lines=(