add satisfy configuration to the ui

This commit is contained in:
Kyle Klaus
2020-04-11 00:26:54 -07:00
parent 8d432bd60a
commit 0f238a5021
8 changed files with 55 additions and 10 deletions

View File

@ -30,6 +30,7 @@ const internalAccessList = {
.omit(omissions())
.insertAndFetch({
name: data.name,
satify_any: data.satify_any,
owner_user_id: access.token.getUserId(1)
});
})
@ -125,7 +126,8 @@ const internalAccessList = {
.query()
.where({id: data.id})
.patch({
name: data.name
name: data.name,
satify_any: data.satify_any,
});
}
})
@ -478,10 +480,12 @@ const internalAccessList = {
return new Promise((resolve, reject) => {
let htpasswd_file = internalAccessList.getFilename(list);
let nginx_file = internalAccessList.getFilename(list) + '.conf';
// 1. remove any existing access file
try {
fs.unlinkSync(htpasswd_file);
fs.unlinkSync(nginx_file);
} catch (err) {
// do nothing
}

View File

@ -26,6 +26,13 @@ exports.up = function (knex/*, Promise*/) {
})
.then(function () {
logger.info('[' + migrate_name + '] access_list_client Table created');
return knex.schema.table('access_list', function (access_list) {
access_list.integer('satify_any').notNull().defaultTo(0);
});
})
.then(() => {
logger.info('[' + migrate_name + '] access_list Table altered');
});
};

View File

@ -27,6 +27,9 @@
"type": "string",
"format": "ipv4"
},
"satify_any": {
"type": "boolean"
},
"meta": {
"type": "object"
}
@ -86,9 +89,12 @@
"name": {
"$ref": "#/definitions/name"
},
"satify_any": {
"$ref": "#/definitions/satify_any"
},
"items": {
"type": "array",
"minItems": 1,
"minItems": 0,
"items": {
"type": "object",
"additionalProperties": false,
@ -148,9 +154,12 @@
"name": {
"$ref": "#/definitions/name"
},
"satify_any": {
"$ref": "#/definitions/satify_any"
},
"items": {
"type": "array",
"minItems": 1,
"minItems": 0,
"items": {
"type": "object",
"additionalProperties": false,