diff --git a/stages/org.osbuild.nginx.conf b/stages/org.osbuild.nginx.conf index 3c2ac8c3..6e48aefa 100755 --- a/stages/org.osbuild.nginx.conf +++ b/stages/org.osbuild.nginx.conf @@ -9,37 +9,39 @@ import sys import osbuild.api from osbuild.util.path import in_tree -SCHEMA = r""" -"additionalProperties": false, -"properties": { - "path": { - "type": "string", - "description": "Config file location", - "default": "/etc/nginx/nginx.conf", - "pattern": "^\\/(?!\\.\\.)((?!\\/\\.\\.\\/).)+$" - }, - "config": { - "type": "object", - "properties": { - "listen": { - "type": "string", - "description": "The address and/or port on which the server will accept requests", - "default": "*:80" - }, - "root": { - "type": "string", - "description": "The root directory for requests", - "default": "/usr/share/nginx/html" - }, - "pid": { - "type": "string", - "description": "File that will store the process ID of the main process", - "default": "/run/nginx.pid" - }, - "daemon": { - "type": "boolean", - "description": "Whether nginx should become a daemon", - "default": true +SCHEMA_2 = r""" +"options": { + "additionalProperties": false, + "properties": { + "path": { + "type": "string", + "description": "Config file location", + "default": "/etc/nginx/nginx.conf", + "pattern": "^\\/(?!\\.\\.)((?!\\/\\.\\.\\/).)+$" + }, + "config": { + "type": "object", + "properties": { + "listen": { + "type": "string", + "description": "The address and/or port on which the server will accept requests", + "default": "*:80" + }, + "root": { + "type": "string", + "description": "The root directory for requests", + "default": "/usr/share/nginx/html" + }, + "pid": { + "type": "string", + "description": "File that will store the process ID of the main process", + "default": "/run/nginx.pid" + }, + "daemon": { + "type": "boolean", + "description": "Whether nginx should become a daemon", + "default": true + } } } }