diff --git a/doc/conf/README.md b/doc/conf/README.md index 05443f5f8d..f3fc7324cd 100644 --- a/doc/conf/README.md +++ b/doc/conf/README.md @@ -35,34 +35,11 @@ Sample `Varnish` configuration file ## LedgerSMB configuration files -One of these should be copied into the ledgersmb install directory unless the -location is overridden with an environment variable. - -* `ledgersmb.conf.default` -a "normal" configuration, it uses the bundled built `Dojo` and is the preferred configuration -* `ledgersmb.conf.unbuilt-dojo` - -If installing using a tarball or system package, this file should only be used. - -If local changes to any of our `Dojo`, `Javascript`, or `HTML` resources are made. - -However if running from a git or other source install, then you will either need -to run with unbuilt-dojo (`src`) or pull in our submodules and build our `Dojo` target. - -__WARNING:__ Running with unbuilt `Dojo` will have a noticeable performance -reduction in most cases. +The file `ledgersmb.yaml` should be copied into the ledgersmb install directory +unless the location is overridden with an environment variable. ## Other Files * `README.md` This readme file of course ;-) -## Testing infrastructure files - -These files are not for normal use, -they are intended for use on the `travis-ci` testing servers - -* `ledgersmb.conf.travis-ci` -`ledgersmb.conf` file configured for running tests on `travis` -* `nginx-travis.conf` -httpd configuration file configured for running tests on `travis` diff --git a/doc/conf/ledgersmb.conf.default b/doc/conf/ledgersmb.conf.default deleted file mode 100644 index 514edbd311..0000000000 --- a/doc/conf/ledgersmb.conf.default +++ /dev/null @@ -1,96 +0,0 @@ -# This file is an example file for the configuration of LedgerSMB. -# A copy should be in the ledgersmb root directory, or an environment -# variable by the name LSMB_CONFIG_FILE should hold the name -# of an alternative location -# -# e.g. -# LSMB_CONFIG_FILE=/etc/ledgersmb/ledgersmb.conf - -[main] - -# Set language for login and admin pages -language = - -# Set the date format for the admin pages -# (default: yyyy-mm-dd; unset means detected from the browser) -date_format = yyyy-mm-dd - -# Specifies the logging level to be used -# This setting is ignored when the 'log_config' setting is supplied and -# indicates an existing file. -# -# Available values are OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE -log_level = ERROR - -# Set the name of the extended logging configuration file -# This file uses the log4j/Log::Log4perl syntax described at -# https://metacpan.org/pod/Log::Log4perl#Configuration-files -# -# Examples in doc/conf/ledgersmb.log.conf.* -#log_config = ledgersmb.log.conf - -# This is the Dojo theme to be used by default -- e.g. when no other theme -# has been selected. -#dojo_theme = claro - -# This is a setting to enable stable testing -#suppress_tooltips = yes - -[environment] -# If the server can't find applications, append to the path -PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/pgsql/bin - -# If on Mac OS X using Fink's Perl libs, append to the path -#PERL5LIB = /sw/lib/perl5 - -[paths] -# templates base directory -templates = templates -# images base directory -images = UI/images - -localepath = locale/po - -# location where compiled templates are stored -# -# When relative, appended to the directory specified by File::Spec->tmpdir() -# -#templates_cache = lsmb_templates - -# directory where workflow files are stored -# -#workflows = workflows - -# directory where custom workflow files are stored -# -# custom workflows are used to override behaviour of the default workflows by -# providing actions/conditions/etc by the same name and type or by providing -# workflows of the same type with e.g. additional states and actions. -# -#custom_workflows = custom_workflows - -[programs] - -[mail] -# This must be set to enable e-mail delivery of backups -# backup_email_from = backups@lsmb_hosting.com - -[proxy] -# The list of IP addresses from which to accept reverse proxy requests -# proxy_ip = 127.0.0.1/8 ::1/128 - -[printers] -# Available printers -#Laser = lpr -Plaser -#Epson = lpr -PEpson - -[database] - -# Sets database connection parameters. Note that default_db can be left blank -# if you want to force people to enter a company name at login. -port = 5432 -default_db = lsmb13 -host = localhost -db_namespace = public -# sslmode can be require, allow, prefer, or disable. Defaults to prefer. -sslmode = prefer diff --git a/doc/conf/ledgersmb.conf.travis-ci b/doc/conf/ledgersmb.conf.travis-ci deleted file mode 100644 index f9a3c61d3a..0000000000 --- a/doc/conf/ledgersmb.conf.travis-ci +++ /dev/null @@ -1,50 +0,0 @@ -[main] -logging = 0 - -# Set language for login and admin pages -# language = - -log_level = OFF -# log_config = - -[environment] -# If the server can't find applications, append to the path -PATH=/bin:/usr/bin:/usr/local/bin:/usr/local/pgsql/bin - -# If on Mac OS X using Fink's Perl libs, append to the path -#PERL5LIB = /sw/lib/perl5 - -[paths] -# templates base directory -templates = templates -# images base directory -images = UI/images -localepath = locale/po - -[programs] - -[mail] -### How to send mail. The sendmail command is used unless smtphost is set. -sendmail = /usr/bin/sendmail -# smtphost = 127.0.0.1 -# smtptimeout = 60 -# backup_email_from = backups@lsmb_hosting.com - -[proxy] -# The list of IP addresses from which to accept reverse proxy requests -# proxy_ip = 127.0.0.1/8 ::1/128 - -[printers] -# Available printers -Laser = lpr -Plaser -Epson = lpr -PEpson - -[database] -# Sets database connection parameters. Note that default_db can be left blank -# if you want to force people to enter a company name at login. -port = 5432 -default_db = lsmb13 -host = localhost -db_namespace = public -# sslmode can be require, allow, prefer, or disable. Defaults to prefer. -sslmode = prefer diff --git a/doc/conf/webserver/nginx-travis.conf b/doc/conf/webserver/nginx-travis.conf deleted file mode 100644 index 4a8f92bcdb..0000000000 --- a/doc/conf/webserver/nginx-travis.conf +++ /dev/null @@ -1,58 +0,0 @@ -# This is a full (minimal) nginx configuration file -# The development team uses this file on their continuous integration -# (testing) infrastructure. It's here as an example, not meant to be -# installed as-is. - -error_log /tmp/error.log; -pid /tmp/nginx.pid; -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - client_body_temp_path /tmp/client_body; - proxy_temp_path /tmp/proxy_temp; - fastcgi_temp_path /tmp/fastcgi_temp; - scgi_temp_path /tmp/scgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - - sendfile on; - tcp_nopush on; - tcp_nodelay on; - keepalive_timeout 65; - types_hash_max_size 2048; - include /etc/nginx/mime.types; - default_type application/octet-stream; - - access_log /tmp/access.log; - error_log /tmp/error.log; - - gzip off; - gzip_static on; - - server { - listen 5000 default_server; - listen [::]:5000 default_server ipv6only=on; - - root {ROOT}/UI; - - access_log /tmp/access.log; - error_log /tmp/error.log; - - location ~ \.pl { - proxy_pass http://localhost:5762; - } - - location /erp/api { - proxy_pass http://localhost:5762; - } - - location / { - try_files $uri $uri/; - } - } -} - -