Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #314 from paxtonhare/dev
Browse files Browse the repository at this point in the history
#308 - fixing auth to use response header to use proper scheme
  • Loading branch information
dmcassel committed Nov 24, 2014
2 parents 70416a7 + e4295a6 commit e31dc0a
Show file tree
Hide file tree
Showing 6 changed files with 250 additions and 234 deletions.
398 changes: 206 additions & 192 deletions deploy/default.properties
Original file line number Diff line number Diff line change
@@ -1,192 +1,206 @@
#################################################################
#
# DO NOT EDIT
#
# This file contains default application configuration options.
# Don't mess with this file. Instead, copy what you need to
# build.properties and edit there.
# This process makes upgrading Roxy easier.
#################################################################

#
# the location of your code to load into ML
#
xquery.dir=${basedir}/src

#
# MarkLogic application servers exist inside a group. ML Instances start off
# with a group called "Default".
#
group=Default

#
# The type of application. Choices are:
# mvc: a normal, XQuery-based Roxy MVC app
# rest: an app based on the ML6 REST API
# hybrid: an app that uses Roxy rewriting and the ML6 REST API
#
app-type=mvc

#
# the location of your REST API options
# relevant to app-types rest and hybrid.
#
rest-options.dir=${basedir}/rest-api/config

#
# the location of your xml data to load into ML
#
data.dir=${basedir}/data

#
# the location of your marklogic configuration file
#
config.file=${basedir}/deploy/ml-config.xml

#
# the location of your schemas
#
schemas.dir=${basedir}/schemas
schemas.root=/

#
# Admin username/password that will exist on the local/dev/prod servers
#
user=admin
password=admin

#
# Your Application's name
#
app-name=roxy
modules-root=/

# The role that is given permissions and execute privileges
app-role=${app-name}-role

#
# The names of your databases. Forests are given the same names
#
app-modules-db=${app-name}-modules
content-db=${app-name}-content
modules-db=${app-name}-modules

#
# Number of forests to create per host in the group for the content-db
#
content-forests-per-host=1

#
# A location on disk to store the forest data. "data directory" in the admin ui
#
# forest-data-dir=

## Unit Testing
# Leave commented out for no test db
# turn it on if you are using the roxy unit tester
# Note: to activate Unit Testing, you must have test-content-db and test-port defined
# test-content-db=${app-name}-content-test
# test-modules-db=${app-modules-db}
#
# The authentication method used for your test appserver
# application-level, basic, digest, digestbasic
#
# test-authentication-method=digest
#
# Leave commented out for no test appserver
# turn it on if you are using the roxy unit tester
# test-port=8042
#
# the environments in which we DO NOT want to deploy tests
# typically your production environment.
do-not-deploy-tests=prod
#
# the location of your unit test code
xquery-test.dir=${basedir}/src/test


# Leave commented out for default
# schemas-db=${app-name}-schemas

# Leave commented out for default
# turn it on if you are using triggers or CPF
# triggers-db=${app-name}-triggers

#
# the port that the Docs appserver is running on
# Docs appserver is required for boostrapping
#
bootstrap-port-five=8002
bootstrap-port-four=8000

qconsole-port=8000

#
# If true, .html files under the src directory will be loaded as XML.
# If false, they will be loaded using the MarkLogic default behavior, which is
# to treat them as text.
#
load-html-as-xml=false

#
# If true, .js and .css files under the src directory will be loaded as binary.
# If false, they will be loaded using the MarkLogic default behavior, which is
# to treat them as text.
#
load-js-as-binary=true
load-css-as-binary=true

#
# The ports used by your application
#
app-port=8040
xcc-port=8041

## Security
#
# The authentication used for your appserver
#
authentication-method=digest
default-user=${app-name}-user
#
# Providing a default empty value
ssl-certificate-template=

#
# The default values point to Roxy file
#
url-rewriter=/roxy/rewrite.xqy
error-handler=/roxy/error.xqy
rewrite-resolves-globally=

# Environments recognized by Roxy
environments=local,dev,prod

#
# The Major version of ML server across your environments (4, 5, 6 or 7). You can override
# this value in build.properties if all of your servers are the same version
# or override it in each ${env}.properties file if each server has a different
# version.
#
server-version=7

#
# the uris or IP addresses of your servers
# WARNING: if you are running these scripts on windows you may need to change localhost to 127.0.0.1
# There have been reported issues with dns resolution when localhost wasn't in the hosts file.
#
local-server=localhost
#dev-server=
#cert-server=
#prod-server=

#
# If you want to use MLCP, make sure mlcp-home is configured correctly. Using a common location as default.
#
mlcp-home=/usr/local/mlcp
mlcp-vmargs=-Xmx512m

#
# Temporary fix to support MarkLogic 8 EA2
#
evaler-port=7998
#################################################################
#
# DO NOT EDIT
#
# This file contains default application configuration options.
# Don't mess with this file. Instead, copy what you need to
# build.properties and edit there.
# This process makes upgrading Roxy easier.
#################################################################

#
# the location of your code to load into ML
#
xquery.dir=${basedir}/src

#
# MarkLogic application servers exist inside a group. ML Instances start off
# with a group called "Default".
#
group=Default

#
# The type of application. Choices are:
# mvc: a normal, XQuery-based Roxy MVC app
# rest: an app based on the ML6 REST API
# hybrid: an app that uses Roxy rewriting and the ML6 REST API
#
app-type=mvc

#
# the location of your REST API options
# relevant to app-types rest and hybrid.
#
rest-options.dir=${basedir}/rest-api/config

#
# the location of your xml data to load into ML
#
data.dir=${basedir}/data

#
# the location of your marklogic configuration file
#
config.file=${basedir}/deploy/ml-config.xml

#
# the location of your schemas
#
schemas.dir=${basedir}/schemas
schemas.root=/

#
# Admin username/password that will exist on the local/dev/prod servers
#
user=admin
password=admin

#
# Your Application's name
#
app-name=roxy
modules-root=/

# The role that is given permissions and execute privileges
app-role=${app-name}-role

#
# The names of your databases. Forests are given the same names
#
app-modules-db=${app-name}-modules
content-db=${app-name}-content
modules-db=${app-name}-modules

#
# Number of forests to create per host in the group for the content-db
#
content-forests-per-host=1

#
# A location on disk to store the forest data. "data directory" in the admin ui
#
# forest-data-dir=

## Unit Testing
# Leave commented out for no test db
# turn it on if you are using the roxy unit tester
# Note: to activate Unit Testing, you must have test-content-db and test-port defined
# test-content-db=${app-name}-content-test
# test-modules-db=${app-modules-db}
#
# The authentication method used for your test appserver
# application-level, basic, digest, digestbasic
#
# test-authentication-method=digest
#
# Leave commented out for no test appserver
# turn it on if you are using the roxy unit tester
# test-port=8042
#
# the environments in which we DO NOT want to deploy tests
# typically your production environment.
do-not-deploy-tests=prod
#
# the location of your unit test code
xquery-test.dir=${basedir}/src/test


# Leave commented out for default
# schemas-db=${app-name}-schemas

# Leave commented out for default
# turn it on if you are using triggers or CPF
# triggers-db=${app-name}-triggers

#
# the port that the Manage appserver is running on
# Manage appserver is required for boostrapping
#
bootstrap-port-five=8002
bootstrap-port-four=8000

#
# The port used to access QConsole (App-Services app server)
#
qconsole-port=8000

#
# If true, .html files under the src directory will be loaded as XML.
# If false, they will be loaded using the MarkLogic default behavior, which is
# to treat them as text.
#
load-html-as-xml=false

#
# If true, .js and .css files under the src directory will be loaded as binary.
# If false, they will be loaded using the MarkLogic default behavior, which is
# to treat them as text.
#
load-js-as-binary=true
load-css-as-binary=true

#
# The ports used by your application
#
app-port=8040
xcc-port=8041

#
# set this to false if you are using an existing XCC server and
# you don't want Roxy to manage it for you
#
install-xcc=true

#
# set this to true if you are using https for your app servers
#
use-https=false

## Security
#
# The authentication used for your appserver
#
authentication-method=digest
default-user=${app-name}-user
#
# Providing a default empty value
ssl-certificate-template=

#
# The default values point to Roxy file
#
url-rewriter=/roxy/rewrite.xqy
error-handler=/roxy/error.xqy
rewrite-resolves-globally=

# Environments recognized by Roxy
environments=local,dev,prod

#
# The Major version of ML server across your environments (4, 5, 6 or 7). You can override
# this value in build.properties if all of your servers are the same version
# or override it in each ${env}.properties file if each server has a different
# version.
#
server-version=7

#
# the uris or IP addresses of your servers
# WARNING: if you are running these scripts on windows you may need to change localhost to 127.0.0.1
# There have been reported issues with dns resolution when localhost wasn't in the hosts file.
#
local-server=localhost
#dev-server=
#cert-server=
#prod-server=

#
# If you want to use MLCP, make sure mlcp-home is configured correctly. Using a common location as default.
#
mlcp-home=/usr/local/mlcp
mlcp-vmargs=-Xmx512m

#
# Temporary fix to support MarkLogic 8 EA2
#
evaler-port=7998
Loading

0 comments on commit e31dc0a

Please sign in to comment.