amarillo/amarillo-core
5
0
Fork 0
Code Issues 17 Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: amarillo:main
Branches Tags
amarillo:main
amarillo:dev
amarillo:fastapi-enhancer
amarillo:permissions
amarillo:carpool-events
amarillo:bearer-token
amarillo:log-errors
amarillo:grfs-export
amarillo:docker-build-test
amarillo:static-files
amarillo:jenkins-test
..
compare: amarillo:permissions
Branches Tags
amarillo:dev
amarillo:fastapi-enhancer
amarillo:main
amarillo:permissions
amarillo:carpool-events
amarillo:bearer-token
amarillo:log-errors
amarillo:grfs-export
amarillo:docker-build-test
amarillo:static-files
amarillo:jenkins-test

No commits in common. "main" and "permissions" have entirely different histories.
main ... permission

2 changed files with 2 additions and 2 deletions
Show stats Expand all files Collapse all files

2
Jenkinsfile vendored
View file

@ -9,7 +9,7 @@ pipeline {
IMAGE_NAME = 'amarillo' IMAGE_NAME = 'amarillo'
AMARILLO_DISTRIBUTION = '0.2' AMARILLO_DISTRIBUTION = '0.2'
TAG = "${AMARILLO_DISTRIBUTION}.${BUILD_NUMBER}" TAG = "${AMARILLO_DISTRIBUTION}.${BUILD_NUMBER}"
PLUGINS = 'amarillo-metrics amarillo-enhancer amarillo-grfs-exporter' PLUGINS = 'amarillo-metrics amarillo-enhancer amarillo-grfs-export'
DEPLOY_WEBHOOK_URL = 'http://amarillo.mfdz.de:8888/mitanand' DEPLOY_WEBHOOK_URL = 'http://amarillo.mfdz.de:8888/mitanand'
DEPLOY_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET') DEPLOY_SECRET = credentials('AMARILLO-JENKINS-DEPLOY-SECRET')
} }

2
amarillo/services/oauth2.py
View file

@ -20,7 +20,7 @@ from amarillo.services.secrets import secrets
SECRET_KEY = secrets.secret_key SECRET_KEY = secrets.secret_key
ALGORITHM = "HS256" ALGORITHM = "HS256"
ACCESS_TOKEN_EXPIRE_MINUTES = 7*24*60 ACCESS_TOKEN_EXPIRE_MINUTES = 30
logging.config.fileConfig('logging.conf', disable_existing_loggers=False) logging.config.fileConfig('logging.conf', disable_existing_loggers=False)
logger = logging.getLogger("main") logger = logging.getLogger("main")