Adds compatibility for Oracle Linux #578
Conversation
| @@ -99,7 +99,7 @@ def install(self, name): | |||
|
|
|||
| def install_many(self, names): | |||
| """Install many packages.""" | |||
| return utils.exec_cmd("yum install -y --quiet {}".format(" ".join(names))) | |||
| return utils.exec_cmd("yum install -y {}".format(" ".join(names))) # Before it was quiet | |||
There was a problem hiding this comment.
Why do you remove the quiet option?
There was a problem hiding this comment.
To see if somehow one of the packages may fail. Also, during this step installation took so long, so it didn't actually seems to be doing anything, or, better said, it didn't give the sensation of progress.
| @@ -90,7 +90,7 @@ class RPMPackage(Package): | |||
| def __init__(self, dist_name): | |||
| """Initialize backend.""" | |||
| super(RPMPackage, self).__init__(dist_name) | |||
| if "centos" in dist_name: | |||
| if dist_name in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
There was a problem hiding this comment.
Maybe a better comparison could be to use the availability of the package manager. Anyways, it still didn't affect CentOS functionality at all. Do you suggest something different?
| @@ -117,7 +117,7 @@ def get_backend(): | |||
| backend = None | |||
| if distname in ["debian", "debian gnu/linux", "ubuntu", "linuxmint"]: | |||
| backend = DEBPackage | |||
| elif "centos" in distname: | |||
| elif distname in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
| @@ -104,7 +104,7 @@ def get_template_context(self): | |||
| ssl_protocols = "!SSLv3" | |||
| if ssl_protocol_parameter == "ssl_min_protocol": | |||
| ssl_protocols = "TLSv1" | |||
| if "centos" in utils.dist_name(): | |||
| if utils.dist_name() in ["centos", "oracle linux server"]: | |||
There was a problem hiding this comment.
Be careful here, you're changing the check logic for centos. This was not a strict comparison
| @@ -29,7 +29,7 @@ def get_socket_path(self, app): | |||
| def get_template_context(self, app): | |||
| """Additionnal variables.""" | |||
| context = super(Uwsgi, self).get_template_context() | |||
| if package.backend.FORMAT == "deb": | |||
| if package.backend.FORMAT == "deb" or True: | |||
There was a problem hiding this comment.
On oracle linux the default usage of python was also python3. Then, I suggest this to be the default scenario, as I don't know in which distros "python36" is being used. (Reversing the logic might be a better solution: in those distro's special cases, use python36 instead of python3)
| @@ -286,7 +286,7 @@ def main(input_args): | |||
| ssl_backend.generate_cert() | |||
| for appname in PRIMARY_APPS: | |||
| scripts.install(appname, config, args.upgrade, args.restore) | |||
| system.restart_service("cron") | |||
| system.restart_service("crond") | |||
There was a problem hiding this comment.
I could give it a try using Rocky, as CentOS is now unavailable. I haven't installed it on debian based distros.
Description of the issue/feature this PR addresses:
Current behavior before PR:
Desired behavior after PR is merged: