Skip to content

Commit

Permalink
adding values to doc/config/config.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
xlecours committed Jun 27, 2018
1 parent 397fa09 commit e8fa59d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ before_script:
- mysql LorisTest -u root -e "GRANT UPDATE,INSERT,SELECT,DELETE,DROP,CREATE TEMPORARY TABLES ON LorisTest.* TO 'SQLTestUser'@'localhost' IDENTIFIED BY 'TestPassword' WITH GRANT OPTION"
- cp docs/config/config.xml project/config.xml
- cp docs/config/config.xml test/config.xml
- sed -i -e "s/%HOSTNAME%/127.0.0.1/g" -e "s/%USERNAME%/SQLTestUser/g" -e "s/%PASSWORD%/TestPassword/g" -e "s/%DATABASE%/LorisTest/g" project/config.xml
- sed -i -e "s/%HOSTNAME%/127.0.0.1/g" -e "s/%USERNAME%/SQLTestUser/g" -e "s/%PASSWORD%/TestPassword/g" -e "s/%DATABASE%/LorisTest/g" test/config.xml
- sed -i -e "s/%HOSTNAME%/127.0.0.1/g" -e "s/%USERNAME%/SQLTestUser/g" -e "s/%PASSWORD%/TestPassword/g" -e "s/%DATABASE%/LorisTest/g" -e "s/%APIUSERNAME%/travis/g" -e 's/%APIPASSWORD%/$Demo4022/g' -e 's/%APIURL%/http://localhost:8000/g' project/config.xml
- sed -i -e "s/%HOSTNAME%/127.0.0.1/g" -e "s/%USERNAME%/SQLTestUser/g" -e "s/%PASSWORD%/TestPassword/g" -e "s/%DATABASE%/LorisTest/g" -e "s/%APIUSERNAME%/travis/g" -e 's/%APIPASSWORD%/$Demo4022/g' -e 's/%APIURL%/http://localhost:8000/g' test/config.xml
- mysql LorisTest -e "INSERT INTO users (UserID, Password, Real_name, First_name, Last_name, Degree, Position_title, Institution, Department, Address, City, State, Zip_code, Country, Fax, Email, Privilege, PSCPI, DBAccess, Active, Password_hash, Password_expiry, Pending_approval, Doc_Repo_Notifications, Phone) VALUES('travis', NULL, 'unix account', 'unix', 'account', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'unixtest@mail.com', 0, 'N', '', 'Y', '$2y$10$6JvNxHFCugACdUPvCpm3zeSLCEwSKsUyBbfv0/tWKAa8Ga8MmeZIG', '2019-12-06', 'N', 'N', NULL)"
- mysql LorisTest -e "INSERT INTO user_psc_rel VALUES ((SELECT ID FROM users WHERE UserID='travis'), 1)"
# Set the admin account password to a known value for testing. This needs to be done
Expand Down
6 changes: 6 additions & 0 deletions docs/config/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
<adminpass>%COUCH_PASSWORD%</adminpass>
</CouchDB>

<api>
<username>%APIUSERNAME%</username>
<password>%APIPASSWORD%</password>
<url>%APIURL%</url>
</api>

<!-- study variables -->
<study>
<PSCID>
Expand Down

0 comments on commit e8fa59d

Please sign in to comment.