rune/malias
1
1
Fork 0
Code Issues Pull Requests Packages Releases 11 Activity

Small error fixes

Browse Source
This commit is contained in:
Rune Olsen
2025-02-21 13:16:42 +01:00
parent 2e85eb7b8b
commit 22a9609dc4
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
malias.py
View File

@@ -1,4 +1,5 @@
#!/usr/bin/python3 #!/usr/bin/python3
import sys
import sqlite3 import sqlite3
from pathlib import Path from pathlib import Path
from sqlite3 import Error from sqlite3 import Error
@@ -6,10 +7,12 @@ import urllib.request
import json import json
import logging import logging
import argparse import argparse
import requests try:
import requests
except ImportError:
sys.path.append("/opt/homebrew/lib/python3.11/site-packages")
import os import os
import time import time
import sys
import git import git
from types import SimpleNamespace from types import SimpleNamespace
from datetime import datetime from datetime import datetime
@@ -331,7 +334,7 @@ def checklist(alias):
remoteData = json.loads(remote) remoteData = json.loads(remote)
i = 0 i = 0
for search in remoteData: for search in remoteData:
if alias == remoteData[i]['address'] || alias in remoteData[i]['goto']: if alias == remoteData[i]['address'] == alias in remoteData[i]['goto']:
alias_exist = True alias_exist = True
i=i+1 i=i+1
cursor = conn.cursor() cursor = conn.cursor()
@@ -514,24 +517,21 @@ def show_current_info():
else: else:
domain = domain + str(mail_domains[i]['domain_name']) domain = domain + str(mail_domains[i]['domain_name'])
i+=1 i+=1
print('\n[b]malias[/b] - Manage aliases on Mailcow instance.') print('\n[b]malias[/b] - Manage aliases on mailcow Instance.')
print('===================================================') print('===================================================')
print("API key\t\t\t: [b]%s[/b]" % (API)) print('API key : [b]%s[/b]' % (API))
print("Mailcow Instance\t: [b]%s[/b]" % (mail_server)) print('Mailcow Instance : [b]%s[/b]' % (mail_server))
print("Active domains\t\t: [b]%s[/b]" % (domain)) print('Active domains : [b]%s[/b]' % (domain))
print("Mailcow version\t\t: [b]%s[/b]" % (mailcow_version)) print('Mailcow version : [b]%s[/b]' % (mailcow_version))
print("Logfile\t\t\t: [b]%s[/b]" % (logfile)) print('Logfile : [b]%s[/b]' % (logfile))
print("Databse\t\t\t: [b]%s[b]" % (database)) print('Databse : [b]%s[b]' % (database))
print("Aliases on server\t: [b]%s[/b]" % (aliases_server)) print('Aliases on server : [b]%s[/b]' % (aliases_server))
print("Aliases in DB\t\t: [b]%s[/b]" % (alias_db)) print('Aliases in DB : [b]%s[/b]' % (alias_db))
print("") print('')
if app_version[:3] != latest_release: if app_version[:3] != latest_release:
print( print('App version : [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias' % (app_version,latest_release))
"App version\t\t\t\t: [b]%s[/b] a new version (%s) is available @ https://iurl.no/malias" else:
% (app_version, latest_release) print('App version : [b]%s[/b]' % (app_version))
)
else:
print("App version\t\t: [b]%s[/b]" % (app_version))
print('') print('')