xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3398 from samveen/mariadbsetup

Browse Source 
[perl-xCAT] Allow `mysqlsetup` to configure mariadb too.
This commit is contained in:
cxhong 2017-07-11 16:17:53 -04:00 committed by GitHub
commit a030a7f59e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
perl-xCAT/xCAT/Utils.pm
View File

@ -4017,14 +4017,14 @@ sub servicemap {
# (general service name) => {list of possible service names}
#
my %svchash = (
"dhcp" => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
"nfs" => [ "nfsserver", "nfs-server", "nfs", "nfs-kernel-server" ],
"named" => [ "named", "bind9" ],
"syslog" => [ "syslog", "syslogd", "rsyslog" ],
"firewall" => [ "iptables", "firewalld", "ufw" ],
"http" => [ "apache2", "httpd" ],
"ntpserver" => [ "ntpd", "ntp" ],
"mysql" => [ "mysqld", "mysql" ],
"dhcp" => [ "dhcp3-server", "dhcpd", "isc-dhcp-server" ],
"nfs" => [ "nfsserver", "nfs-server", "nfs", "nfs-kernel-server" ],
"named" => [ "named", "bind9" ],
"syslog" => [ "syslog", "syslogd", "rsyslog" ],
"firewall" => [ "iptables", "firewalld", "ufw" ],
"http" => [ "apache2", "httpd" ],
"ntpserver" => [ "ntpd", "ntp" ],
"mysql" => [ "mysqld", "mysql", "mariadb" ],
);
my $path = undef;

6
travis.pl
View File

@ -452,7 +452,11 @@ my @travis_env_attr = ("TRAVIS_REPO_SLUG",
"PASSWORD",
"PWD");
foreach (@travis_env_attr){
print "$_ = $ENV{$_}\n";
if($ENV{$_}) {
print "$_ = '$ENV{$_}'\n";
} else {
print "$_ = ''\n";
}
}
my @os_info = runcmd("cat /etc/os-release");