diff --git a/contrib/fabfile.tar.gz b/contrib/fabfile.tar.gz index 9817ad2a75..4f573e5cdd 100644 Binary files a/contrib/fabfile.tar.gz and b/contrib/fabfile.tar.gz differ diff --git a/fabfile/__init__.py b/fabfile/__init__.py index 3bb092a3bd..d4f48fe803 100644 --- a/fabfile/__init__.py +++ b/fabfile/__init__.py @@ -5,11 +5,10 @@ import databases as database import webservers as webserver import platforms as platform import django -from conf import setup_environment +from conf import setup_environment, print_supported_configs setup_environment() - print(white('\n\n ######## ', bold=True)) print(white(' ######## ', bold=True)) print(white(' ### ### ', bold=True)) @@ -25,6 +24,8 @@ print(white('############# #############', bold=True)) print(white('\nMayan EDMS Fabric installation file\n\n', bold=True)) +print_supported_configs() + @task(default=True) def install(): diff --git a/fabfile/conf.py b/fabfile/conf.py index b0ec550ac7..9574948f9f 100644 --- a/fabfile/conf.py +++ b/fabfile/conf.py @@ -44,3 +44,10 @@ def setup_environment(): env['webserver_name'] = WEB_CHOICES[env.webserver] env['django_database_driver'] = DJANGO_DB_DRIVERS[env.database_manager] + + +def print_supported_configs(): + print('Supported operating systems (os=): %s' % dict(OS_CHOICES).keys()) + print('Supported database managers (database_manager=): %s' % dict(DB_CHOICES).keys()) + print('Supported webservers (webserver=): %s' % dict(WEB_CHOICES).keys()) + print('\n') diff --git a/fabfile/literals.py b/fabfile/literals.py index 7d93f9fd82..23f5c44c4d 100644 --- a/fabfile/literals.py +++ b/fabfile/literals.py @@ -3,15 +3,15 @@ OS_REDHAT = 'redhat' OS_CENTOS = 'centos' OS_FEDORA = 'fedora' OS_WINDOWS = 'windows' -OS_FREEBSD = 'freebds', +OS_FREEBSD = 'freebds' OS_CHOICES = { OS_UBUNTU: 'Ubuntu', - OS_REDHAT: 'RedHat', - OS_CENTOS: 'CentOS', OS_FEDORA: 'Fedora', - OS_WINDOWS: 'MS Windows', - OS_FREEBSD: 'FreeBSD', + #OS_REDHAT: 'RedHat', + #OS_CENTOS: 'CentOS', + #OS_WINDOWS: 'MS Windows', + #OS_FREEBSD: 'FreeBSD', } DEFAULT_INSTALL_PATH = { @@ -36,9 +36,9 @@ DB_ORACLE = 'oracle' DB_CHOICES = { DB_MYSQL: 'MySQL', - DB_PGSQL: 'PostgreSQL', - DB_SQLITE: 'SQLite', - DB_ORACLE: 'ORACLE' + #DB_PGSQL: 'PostgreSQL', + #DB_SQLITE: 'SQLite', + #DB_ORACLE: 'ORACLE' } DJANGO_DB_DRIVERS = { @@ -53,7 +53,7 @@ WEB_NGINX = 'nginx' WEB_CHOICES = { WEB_APACHE: 'Apache', - WEB_NGINX: 'Nginx', + #WEB_NGINX: 'Nginx', } DEFAULT_OS = OS_UBUNTU