Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feature/bullseye Add support for Debian 11.6 (bullseye) #113

Open
wants to merge 2 commits into
base: 1.5.3-maintenance
Choose a base branch
from
Open

feature/bullseye Add support for Debian 11.6 (bullseye) #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be7b58a
.gitignore
cambell-prince Jul 20, 2021
af65c0a
feature/bullseye: Fixes to support Debian 11.x
cambell-prince Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,10 @@ nbproject
/Vagrantfile
.DS_Store
_Deparsed_XSubs.pm

.vscode/
daemon/*.o
daemon/imscp_daemon
gui/data/*
gui/vendor/
gui/library/
10 changes: 6 additions & 4 deletions autoinstaller/Functions.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ sub loadConfig
{
my $lsb = iMSCP::LsbRelease->getInstance();
my $distConf = "$FindBin::Bin/configs/" . lc( $lsb->getId( TRUE ))
. '/imscp.conf';
my $defaultConf = "$FindBin::Bin/configs/debian/imscp.conf";
. '/default/imscp.conf';
my $defaultConf = "$FindBin::Bin/configs/debian/default/imscp.conf";
my $newConf = -f $distConf ? $distConf : $defaultConf;

# Load new configuration
Expand Down Expand Up @@ -427,8 +427,10 @@ sub _buildLayout

sub _buildConfigFiles
{
my $distroConfigDir = "$FindBin::Bin/configs/$::imscpConfig{'DISTRO_ID'}";
my $defaultConfigDir = "$FindBin::Bin/configs/debian";
my $distroConfigDir = -d "$FindBin::Bin/configs/$::imscpConfig{'DISTRO_ID'}/$::imscpConfig{'DISTRO_CODENAME'}"
? "$FindBin::Bin/configs/$::imscpConfig{'DISTRO_ID'}/$::imscpConfig{'DISTRO_CODENAME'}"
: "$FindBin::Bin/configs/$::imscpConfig{'DISTRO_ID'}/default";
my $defaultConfigDir = "$FindBin::Bin/configs/debian/default";
my $confDir = -d $distroConfigDir ? $distroConfigDir : $defaultConfigDir;

local $CWD = $confDir;
Expand Down
Loading