Skip to content

Commit

Permalink
Merge pull request #51 from OpenSRP/37-remove-couchdb-configuration
Browse files Browse the repository at this point in the history
Make couchdb configuration optional, Strip configs on removed depencies
  • Loading branch information
githengi authored Mar 20, 2020
2 parents 4cc1980 + dcb1dde commit 04e0682
Show file tree
Hide file tree
Showing 15 changed files with 43 additions and 1,668 deletions.
6 changes: 0 additions & 6 deletions assets/config/activemq.properties

This file was deleted.

48 changes: 0 additions & 48 deletions assets/config/opensrp.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
sms.can.be.sent=false
number.of.audit.messages=1000

form.poll.time.interval=2
mcts.phone.number=8762963816
js.directory.name=/ziggy
form.directory.name=/form
multimedia.directory.name=/opt/multimedia
form.download.files=form.xml, model.xml, form_definition.json
qrcodes.directory.name=/home/opensrp/qr-codes/

schedule.config.path=/schedules/schedule-config.xls
schedule.config.json.path=/schedules/schedule-config.json
schedules.config.files.dir=/schedules/schedule-configs

report-fields-definition-path=/report-fields-definition.json
report-definition-path=/report-definition.json
mcts-report-definition-path=/mcts-report-definition.json
mcts-report-delay-in-days=10
mcts.poll.time.interval.in.minutes=10

# OpenMRS configuration
openmrs.url=http://localhost:8080/openmrs/
Expand Down Expand Up @@ -48,38 +32,6 @@ couchdb.password=adminpass

couchdb.atomfeed-db.revision-limit=2

# properties for postgres db in opensrp-web and opensrp-reporting modules
jdbc.backend=MYSQL
jdbc.driverClassName=com.mysql.jdbc.Driver
jdbc.username=root
jdbc.password=VA1913wm
jdbc.url=jdbc:mysql://localhost:3306/opensrp?createDatabaseIfNotExist=true

##jdbc url with server and port but without database
jdbc.url-wo-db=jdbc:mysql://localhost:3306

# Hibernate properties for Reporting DB
hibernate.dialect=org.hibernate.dialect.MySQLDialect
# hibernate.hbm2ddl.auto=update
hibernate.show_sql=true
hibernate.format_sql=false
hibernate.auto_commit=false

hibernate.c3p0.max_size=15
hibernate.c3p0.min_size=3
hibernate.c3p0.timeout=60000
hibernate.c3p0.max_statements=20
hibernate.c3p0.idle_test_period=300
hibernate.c3p0.acquire_increment=3

preferred.time=7
aggregator.dataset.url=http://bamboo.io/datasets/55a9e822cf46480eb1f24970741ceb15
aggregated.dataset.url=http://bamboo.io/datasets/5d0734ccf76c4153a9db750b86ca49b9
number.of.reports.sent.in.a.batch=100
batch.update.time.interval=5
drishti.site.url=http://localhost:9000
application.context=org.springframework.web.context.WebApplicationContext:/opensrp

#RapidPro settings
rapidpro.url=https://rapidpro.ona.io
rapidpro.token=YOUR_AUTH_TOKEN
Expand Down
Empty file removed assets/config/osgi.properties
Empty file.
2 changes: 0 additions & 2 deletions assets/config/schedule_tracking.properties

This file was deleted.

11 changes: 0 additions & 11 deletions build/maven.properties
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
#database configuration that is not likely to change unless massive refactoring
couchdb.db.opensrp=opensrp
couchdb.db.form=opensrp-form
couchdb.db.atomfeed=atomfeed
couchdb.db.mcts=opensrp-mcts
couchdb.db.motech-scheduletracking=motech-scheduletracking-api
couchdb.db.error=opensrp-errortrace


db.quartz=motechquartz
db.reporting=opensrp
db.reporting.report=report
db.reporting.anm=anm_report


#selenium
test.driver=htmlunit
Expand Down
55 changes: 0 additions & 55 deletions build/sql/tables_opensrp.sql

This file was deleted.

148 changes: 0 additions & 148 deletions build/sql/tables_quartz_MYSQL.sql

This file was deleted.

Loading

0 comments on commit 04e0682

Please sign in to comment.