diff --git a/flowspy/settings.py.centos.dist b/flowspy/settings.py.centos.dist index f41935773ff05f983dd827ba2cf195d215dae7b8..a5c265e98fa5fa4359004583b7aafe274d9a91a6 100644 --- a/flowspy/settings.py.centos.dist +++ b/flowspy/settings.py.centos.dist @@ -73,6 +73,12 @@ DATABASES = { #LOG_FILE_LOCATION = "/var/log/fod" LOG_FILE_LOCATION = "/srv/flowspy/log/" +LOGGING_FORMAT_DEFAULT = '%(asctime)s %(name)s %(levelname)s: %(message)s' +#LOGGING_FORMAT_DEFAULT = '%(processName)s[%(process)d] %(asctime)s %(name)s %(levelname)s: %(message)s' + +# "error" | "warn" | "info" | "debug" +LOG_LEVEL = "info" + # A sample logging configuration. The only tangible logging # performed by this configuration is to send an email to # the site admins on every HTTP 500 error when DEBUG=False. @@ -182,7 +188,11 @@ TEMPLATES = [ 'context_processors': [ "django.contrib.auth.context_processors.auth", 'django_settings_export.settings_export', - ] + 'django.contrib.messages.context_processors.messages' + ], + 'libraries': { # Adding this section should work around the issue. + 'staticfiles' : 'django.templatetags.static', + } }, }, ] @@ -432,6 +442,7 @@ SHIB_ENTITLEMENT_DISPLAY_ADDINFO = "urn:oid:1.3.6.1.4.1.5923.1.1.1.7; the value SHIB_AUTH_ENTITLEMENT = 'urn:mace:example.com:pki:user' #SHIB_AUTH_ENTITLEMENT = '' # is also in settings_local.py so override it there +#SHIB_USERNAME__OLD_TO_MIGRATE = ['HTTP_PERSISTENT_ID'] # in settings.py.dist # originally used for SHIB_USERNAME SHIB_USERNAME = ['HTTP_EPPN'] # in settings.py.dist # originally used for SHIB_USERNAME SHIB_USERNAME_DISPLAY_NAME = "eduPersonPrincipalName" SHIB_USERNAME_DISPLAY_ADDINFO = "urn:mace:dir:attribute-def:eduPersonPrincipalName or urn:oid:1.3.6.1.4.1.5923.1.1.1.6" @@ -635,4 +646,10 @@ ENABLE_SETUP_VIEW = False ############################################################################## ############################################################################## +#PROXY_CLASS="proxy_netconf_junos" +PROXY_CLASS="proxy_exabgp" + +############################################################################## +############################################################################## + from flowspy.settings_local import * diff --git a/install-centos-fixcentos-sqlite.sh b/install-centos-fixcentos-sqlite.sh index c0fa3fcc5efb629976657eadd9a55544be9b5401..2416d1320c15a437e5b98e5ab37015d0bdd8a331 100755 --- a/install-centos-fixcentos-sqlite.sh +++ b/install-centos-fixcentos-sqlite.sh @@ -16,7 +16,8 @@ if cat /etc/centos-release | grep -q "release 7."; then # https://stackoverflow.com/questions/60826836/improperlyconfiguredsqlite-3-8-3-or-later-is-required-found-s-database yum install -y make - cd ~ && curl https://www.sqlite.org/2020/sqlite-autoconf-3320100.tar.gz > sqlite-autoconf-3320100.tar.gz && tar xvfz sqlite-autoconf-3320100.tar.gz && cd sqlite-autoconf-3320100 && ./configure && make && make install + #cd ~ && curl https://www.sqlite.org/2020/sqlite-autoconf-3320100.tar.gz > sqlite-autoconf-3320100.tar.gz && tar xvfz sqlite-autoconf-3320100.tar.gz && cd sqlite-autoconf-3320100 && ./configure && make && make install + cd ~ && curl https://www.sqlite.org/2023/sqlite-autoconf-3410200.tar.gz > sqlite-autoconf.tar.gz && tar xvfz sqlite-autoconftar.gz && cd sqlite-autoconf-3410200 && ./configure && make && make install ## diff --git a/requirements.txt.python3.6.8 b/requirements.txt.python3.6.8 index 77ddc870c63234df08e9ed91cfc49b7bbc2245df..91f07ec07faba2ff0101522c3cd9a8f2aca4d6e9 100644 --- a/requirements.txt.python3.6.8 +++ b/requirements.txt.python3.6.8 @@ -9,7 +9,7 @@ djangorestframework==3.12.0 django-tinymce django-form-utils django-settings-export -Django==2.2.28 +Django==3.2.16 gevent greenlet gunicorn