mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2025-11-17 10:56:21 +00:00
feat: slight refactors to improve logic
This commit is contained in:
@@ -1,3 +0,0 @@
|
|||||||
FROM ubuntu:24.04
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get full-upgrade -y
|
|
||||||
@@ -57,7 +57,7 @@ stop_service() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo "------------------------- START ----------------------------"
|
echo "------------------------- START ----------------------------"
|
||||||
echo "Starting the WireGuard Dashboard Docker container."
|
echo "Starting the WGDashboard Docker container."
|
||||||
|
|
||||||
ensure_installation() {
|
ensure_installation() {
|
||||||
echo "Quick-installing..."
|
echo "Quick-installing..."
|
||||||
@@ -139,7 +139,7 @@ set_envvars() {
|
|||||||
set_ini Server app_port "${wgd_port}"
|
set_ini Server app_port "${wgd_port}"
|
||||||
|
|
||||||
# Account settings - process all parameters
|
# Account settings - process all parameters
|
||||||
echo "Configuring user account:"
|
[[ -n "$username" ]] && echo "Configuring user account:"
|
||||||
# Basic account variables
|
# Basic account variables
|
||||||
[[ -n "$username" ]] && set_ini Account username "${username}"
|
[[ -n "$username" ]] && set_ini Account username "${username}"
|
||||||
|
|
||||||
|
|||||||
@@ -174,12 +174,18 @@ class AmneziaWireguardConfiguration(WireguardConfiguration):
|
|||||||
|
|
||||||
def getPeers(self):
|
def getPeers(self):
|
||||||
self.Peers.clear()
|
self.Peers.clear()
|
||||||
|
current_app.logger.info(f"Refreshing {self.Name} peer list")
|
||||||
|
|
||||||
if self.configurationFileChanged():
|
if self.configurationFileChanged():
|
||||||
with open(self.configPath, 'r') as configFile:
|
with open(self.configPath, 'r') as configFile:
|
||||||
p = []
|
p = []
|
||||||
pCounter = -1
|
pCounter = -1
|
||||||
content = configFile.read().split('\n')
|
content = configFile.read().split('\n')
|
||||||
try:
|
try:
|
||||||
|
if "[Peer]" not in content:
|
||||||
|
current_app.logger.info(f"{self.Name} config has no [Peer] section")
|
||||||
|
return
|
||||||
|
|
||||||
peerStarts = content.index("[Peer]")
|
peerStarts = content.index("[Peer]")
|
||||||
content = content[peerStarts:]
|
content = content[peerStarts:]
|
||||||
for i in content:
|
for i in content:
|
||||||
|
|||||||
@@ -399,13 +399,17 @@ class WireguardConfiguration:
|
|||||||
def getPeers(self):
|
def getPeers(self):
|
||||||
tmpList = []
|
tmpList = []
|
||||||
current_app.logger.info(f"Refreshing {self.Name} peer list")
|
current_app.logger.info(f"Refreshing {self.Name} peer list")
|
||||||
|
|
||||||
if self.configurationFileChanged():
|
if self.configurationFileChanged():
|
||||||
with open(self.configPath, 'r') as configFile:
|
with open(self.configPath, 'r') as configFile:
|
||||||
p = []
|
p = []
|
||||||
pCounter = -1
|
pCounter = -1
|
||||||
content = configFile.read().split('\n')
|
content = configFile.read().split('\n')
|
||||||
try:
|
try:
|
||||||
if "[Peer]" in content:
|
if "[Peer]" not in content:
|
||||||
|
current_app.logger.info(f"{self.Name} config has no [Peer] section")
|
||||||
|
return
|
||||||
|
|
||||||
peerStarts = content.index("[Peer]")
|
peerStarts = content.index("[Peer]")
|
||||||
content = content[peerStarts:]
|
content = content[peerStarts:]
|
||||||
for i in content:
|
for i in content:
|
||||||
@@ -471,8 +475,6 @@ class WireguardConfiguration:
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
tmpList.append(Peer(tempPeer, self))
|
tmpList.append(Peer(tempPeer, self))
|
||||||
else:
|
|
||||||
current_app.logger.warning(f"{self.Name} is an empty configuration")
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
current_app.logger.error(f"{self.Name} getPeers() Error", e)
|
current_app.logger.error(f"{self.Name} getPeers() Error", e)
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in New Issue
Block a user