mirror of
https://github.com/wekan/wekan.git
synced 2026-02-02 22:51:47 +01:00
-conflits resolve
This commit is contained in:
parent
688ef08cd5
commit
080fcb9c62
141 changed files with 4856 additions and 931 deletions
|
|
@ -1,21 +1,26 @@
|
|||
// https://atmospherejs.com/lucasantoniassi/accounts-lockout
|
||||
// server
|
||||
import { AccountsLockout } from 'meteor/lucasantoniassi:accounts-lockout';
|
||||
Meteor.startup(() => {
|
||||
// https://atmospherejs.com/lucasantoniassi/accounts-lockout
|
||||
// server
|
||||
|
||||
new AccountsLockout({
|
||||
knownUsers: {
|
||||
failuresBeforeLockout:
|
||||
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE || 3,
|
||||
lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD || 60,
|
||||
failureWindow:
|
||||
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW || 15,
|
||||
},
|
||||
unknownUsers: {
|
||||
failuresBeforeLockout:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE || 3,
|
||||
lockoutPeriod:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD || 60,
|
||||
failureWindow:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW || 15,
|
||||
},
|
||||
}).startup();
|
||||
if (Meteor.isServer) {
|
||||
import { AccountsLockout } from 'meteor/wekan-accounts-lockout';
|
||||
|
||||
new AccountsLockout({
|
||||
knownUsers: {
|
||||
failuresBeforeLockout:
|
||||
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE || 3,
|
||||
lockoutPeriod: process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD || 60,
|
||||
failureWindow:
|
||||
process.env.ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW || 15,
|
||||
},
|
||||
unknownUsers: {
|
||||
failuresBeforeLockout:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE || 3,
|
||||
lockoutPeriod:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD || 60,
|
||||
failureWindow:
|
||||
process.env.ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW || 15,
|
||||
},
|
||||
}).startup();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ Meteor.publish('setting', () => {
|
|||
customHTMLbeforeBodyEnd: 1,
|
||||
displayAuthenticationMethod: 1,
|
||||
defaultAuthenticationMethod: 1,
|
||||
spinnerName: 1,
|
||||
},
|
||||
},
|
||||
);
|
||||
|
|
|
|||
3
server/spinner.js
Normal file
3
server/spinner.js
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
Meteor.startup(() => {
|
||||
Meteor.settings.public.WAIT_SPINNER = process.env.WAIT_SPINNER;
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue