Merge branch 'master' of github.com:modoboa/modoboa-installer

This commit is contained in:
Antoine Nguyen
2020-11-10 16:09:39 +01:00
4 changed files with 41 additions and 4 deletions

7
.github/dependabot.yml vendored Normal file
View File

@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10

28
.github/stale.yml vendored Normal file
View File

@@ -0,0 +1,28 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 14
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
- bug
- dependencies
- enhancement
- looking-for-sponsors
- documentation
# Label to use when marking an issue as stale
staleLabel: stale
# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true
# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: true
# Limit to only `issues` or `pulls`
only: issues
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

View File

@@ -22,7 +22,8 @@ An installer which deploy a complete mail server based on Modoboa.
The server (physical or virtual) running Modoboa needs at least 2GB The server (physical or virtual) running Modoboa needs at least 2GB
of RAM in order to compile the required dependencies during the of RAM in order to compile the required dependencies during the
installation process. Passwords should not contain any special characters installation process. Passwords should not contain any special characters
as they may cause the installation to fail as they may cause the installation to fail. It's important to set a FQDN
before, otherwise the installation will break.
Usage:: Usage::

View File

@@ -75,7 +75,8 @@ class LetsEncryptCertificate(CertificateBackend):
def install_certbot(self): def install_certbot(self):
"""Install certbot script to generate cert.""" """Install certbot script to generate cert."""
name, version, _id = utils.dist_info() name, version, _id = utils.dist_info()
if name == "Ubuntu": name = name.lower()
if name == "ubuntu":
package.backend.update() package.backend.update()
package.backend.install("software-properties-common") package.backend.install("software-properties-common")
utils.exec_cmd("add-apt-repository -y universe") utils.exec_cmd("add-apt-repository -y universe")
@@ -83,10 +84,10 @@ class LetsEncryptCertificate(CertificateBackend):
utils.exec_cmd("add-apt-repository -y ppa:certbot/certbot") utils.exec_cmd("add-apt-repository -y ppa:certbot/certbot")
package.backend.update() package.backend.update()
package.backend.install("certbot") package.backend.install("certbot")
elif name == "Debian": elif name == "debian":
package.backend.update() package.backend.update()
package.backend.install("certbot") package.backend.install("certbot")
elif "CentOS" in name: elif "centos" in name:
package.backend.install("certbot") package.backend.install("certbot")
else: else:
utils.printcolor("Failed to install certbot, aborting.", utils.RED) utils.printcolor("Failed to install certbot, aborting.", utils.RED)