Skip to content

Commit a7ef358

Browse files
pbchasepbchase
committed
Merge branch 'release/1.2.0'
2 parents 98c7082 + d0c6e5a commit a7ef358

File tree

22 files changed

+317
-44
lines changed

22 files changed

+317
-44
lines changed

‎CHANGELOG.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22
All notable changes to the REDCap Deployment project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
6+
## [1.2.0] - 2017-08-15
7+
### Added
8+
- Add new users and change passwords to 'password' in test_with_table_based_authentication.sql (Philip Chase)
9+
- Add scripts to deploy `ssl.conf` (marlycormar)
10+
- Add `ssl.conf` file containing the required cipher suites to comply with the NIST document on server security (marlycormar)
11+
- Add pdf toolkit installation to the provisioning scripts (marlycormar)
12+
- Add a SQL file that can be used to fix busted PRMIS credentials (Philip Chase)
13+
- Add script to disable Messenger (marlycormar)
14+
- Add deployment of linear work flow deploy script (suryayalla)
15+
- Add deployment of find_survey_from_survey_hash plugin (Stewart Wehmeyer)
16+
- Add deployment of custom_project_settings_plugin (suryayalla)
17+
- Add test methods testSendItDownload and testRouteToSendItController (Philip Chase)
18+
- Add option to follow redirects in tests (Philip Chase)
19+
20+
### Changed
21+
- Remove lines that were changing env.user to deploy_user (Philip Chase)
22+
- Fix PHP 5 installation by using oldstable debian repos as sources. (Tiago Bember Simeao)
23+
- Import configparser from six.moves to address fabric import failures when fabric is installed using brew (suryayalla)
24+
25+
526
## [1.1.0] - 2017-05-31
627
### Added
728
- Add documentation for language configuration (marlycormar)

‎bootstrap.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ apt-get install -y netselect-apt
3535
cd /etc/apt/
3636
netselect-apt -c US > ~/netselect-apt.log 2>&1
3737

38+
# Setting oldstable debian repository
39+
echo "deb http://debian.gtisc.gatech.edu/debian/ oldstable main contrib" > /etc/apt/sources.list
40+
echo "deb-src http://debian.gtisc.gatech.edu/debian/ oldstable main contrib" >> /etc/apt/sources.list
41+
echo "deb http://security.debian.org/ oldstable/updates main contrib" >> /etc/apt/sources.list
42+
echo "deb-src http://security.debian.org/ oldstable/updates main contrib" >> /etc/apt/sources.list
43+
3844
# Update our repos
3945
log "Updating apt package indicies..."
4046
apt-get update
@@ -68,3 +74,6 @@ write_dot_mysql_dot_cnf $DB $DB_APP_USER $DB_APP_PASSWORD $DB_ROOT_PASS
6874

6975
# configure the mail server
7076
configure_exim4
77+
78+
# install pdf toolkit
79+
install_pdftk

‎bootstrap_functions.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ END
102102
cp /vagrant/files/apache-default.conf /etc/apache2/sites-available/000-default.conf
103103
ln -sfv /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/000-default.conf
104104

105+
cp /vagrant/files/ssl.conf /etc/apache2/mods-available/ssl.conf
106+
105107
log "Enable apache modules"
106108
a2enmod ssl
107109
a2enmod rewrite
@@ -405,3 +407,8 @@ function configure_php_mail() {
405407
sed -e "sX.*mail.log.*Xmail.log = syslogX;" -i /etc/php5/apache2/php.ini
406408
}
407409

410+
function install_pdftk() {
411+
echo "Installing PDF Toolkit..."
412+
apt-get install -y pdftk
413+
}
414+

‎deploy/files/disable_messenger.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
update redcap_config set value=0 where field_name="user_messaging_enabled";

‎deploy/files/reset_data_fields_that_block_automatic_creation_of_promis_credentials.sql‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
-- Reset data fields that block automatic creation of PROMIS credentials
2+
3+
-- These values need to be very plain. A URL in the homepage_contact_email field can easily cause trouble.
4+
update redcap_config set value = "" where field_name = 'homepage_contact';
5+
update redcap_config set value = "" where field_name = 'homepage_contact_email';
6+
7+
-- This citation line is used at the University of Florida. Use whatever is appropriate at your site.
8+
update redcap_config set value = 'NCATS grant UL1 TR000064' where field_name = 'homepage_grant_cite';
9+
10+
-- Now erase the credentials so REDCap will try to regenerate them.
11+
update redcap_config set value = "" where field_name = 'promis_token';
12+
update redcap_config set value = "" where field_name = 'promis_registration_id';

‎deploy/files/test_with_table_based_authentication.sql‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33
-- Users:
44
-- admin - the Admin Account
55
-- alice - the Account Manager
6-
-- bob - a user with basic permissions
6+
-- bob - a user with basic permissions
7+
-- carol - a user with basic permissions
8+
-- dan - a user with basic permissions
79
--
8-
-- The password for each user is 'Password1'
10+
-- The password for each user is 'password'
911
-- All email address are fake addresses at projectredcap.org
1012
--
1113
-- Please change passwords and email addresses on any system that is more than a isolated, local test system.
1214
-- Alternatively, just delete these accounts after the roles have been assigned to new accounts.
1315
-- Written for 6.18.1.
1416
-- Tested on 6.18.1 and 7.2.2
15-
REPLACE INTO `redcap_auth` VALUES ('admin','f00a29960d1108086c2d86742bfc5a89','6hgNrh8n%A3R4GwIuny@quxwHjVo7yu%B&4U@LmKd~n72UJzJ&xBEN-t4CYzIyxVzucwQm.vLK.N23S.Ltc@ZZq~$jFxhYU~bopz',0,0,NULL,NULL,NULL,NULL);
16-
REPLACE INTO `redcap_auth` VALUES ('alice','bea198176813848e6167cd43baaf5094','66~xW#[email protected]!M..FXDTy&VMDUHmPILK4^GLBQ5mRj3%XW%YUaM8Wpyi7*iBtJvTrUcT8c&qmuyVqe&*ZUfWRae6&2BCY^A',0,0,NULL,NULL,NULL,NULL);
17-
REPLACE INTO `redcap_auth` VALUES ('bob','7fd2b57c81616c7123650eaa7355d9e9','z%QiWLyN@w3y9UQKdB%%GHDtS%@A9cYP*!oPXy4kkZR.&V@hJvpP.^udA5JWCg!mzYA6W.37$8mMWW.j$huhemeKrYFoTj@sSABz',0,0,NULL,NULL,NULL,NULL);
17+
-- Set paswords to the the md5 of the the password with the salt append. e.g.
18+
-- md5('password'.'my_salt_string')
19+
REPLACE INTO `redcap_auth` VALUES ('admin',md5(concat('password', 'my_salt_string')),'my_salt_string',0,0,NULL,NULL,NULL,NULL);
20+
REPLACE INTO `redcap_auth` VALUES ('alice',md5(concat('password', 'my_salt_string')),'my_salt_string',0,0,NULL,NULL,NULL,NULL);
21+
REPLACE INTO `redcap_auth` VALUES ('bob', md5(concat('password', 'my_salt_string')),'my_salt_string',0,0,NULL,NULL,NULL,NULL);
22+
REPLACE INTO `redcap_auth` VALUES ('carol',md5(concat('password', 'my_salt_string')),'my_salt_string',0,0,NULL,NULL,NULL,NULL);
23+
REPLACE INTO `redcap_auth` VALUES ('dan', md5(concat('password', 'my_salt_string')),'my_salt_string',0,0,NULL,NULL,NULL,NULL);
1824

1925
REPLACE INTO `redcap_config` VALUES ('auth_meth_global','table');
2026

@@ -57,7 +63,7 @@ api_token,
5763
messaging_email_preference,
5864
messaging_email_urgent_all,
5965
messaging_email_ts)
60-
VALUES (1,'site_admin','[email protected]',NULL,NULL,NULL,NULL,'Joe','User',NULL,0,0,NULL,'2017-02-02 14:07:08','2017-02-02 14:15:52','2017-02-02 14:22:19','2017-02-02 14:15:15',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','PYCDZD4KK2ST2AYZ',1,1,2,NULL,'X_HOURS',1,NULL);
66+
VALUES (1,'site_admin','[email protected]',NULL,NULL,NULL,NULL,'Joe','User',NULL,0,0,NULL,'2017-02-02 14:07:08','2017-02-02 14:15:52','2017-02-02 14:22:19','2017-02-02 14:15:15',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','PYCDZD4KK2ST2AYZ',1,1,2,NULL,'NONE',1,NULL);
6167

6268
REPLACE INTO `redcap_user_information`
6369
(ui_id,
@@ -98,7 +104,7 @@ api_token,
98104
messaging_email_preference,
99105
messaging_email_urgent_all,
100106
messaging_email_ts)
101-
VALUES (2,'admin','[email protected]','','',NULL,NULL,'Joe','Admin','',1,0,'2017-02-02 14:15:52','2017-02-02 14:23:03','2017-02-02 14:22:41','2017-02-02 14:23:03','2017-02-02 14:22:42',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','7HXAGUD5HJD7QP3I',1,1,2,NULL,'X_HOURS',1,NULL);
107+
VALUES (2,'admin','[email protected]','','',NULL,NULL,'Joe','Admin','',1,0,'2017-02-02 14:15:52','2017-02-02 14:23:03','2017-02-02 14:22:41','2017-02-02 14:23:03','2017-02-02 14:22:42',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','7HXAGUD5HJD7QP3I',1,1,2,NULL,'NONE',1,NULL);
102108

103109
REPLACE INTO `redcap_user_information`
104110
(ui_id,
@@ -139,7 +145,7 @@ api_token,
139145
messaging_email_preference,
140146
messaging_email_urgent_all,
141147
messaging_email_ts)
142-
VALUES (3,'alice','[email protected]','','',NULL,NULL,'Alice','Manager','',0,1,'2017-02-02 14:21:22','2017-02-02 14:26:49','2017-02-02 14:26:40','2017-02-02 14:26:49','2017-02-02 14:26:40',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','64E2ESJTNTFAUYS4',1,1,2,NULL,'X_HOURS',1,NULL);
148+
VALUES (3,'alice','[email protected]','','',NULL,NULL,'Alice','Manager','',0,1,'2017-02-02 14:21:22','2017-02-02 14:26:49','2017-02-02 14:26:40','2017-02-02 14:26:49','2017-02-02 14:26:40',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','64E2ESJTNTFAUYS4',1,1,2,NULL,'NONE',1,NULL);
143149

144150
REPLACE INTO `redcap_user_information`
145151
(ui_id,
@@ -180,4 +186,12 @@ api_token,
180186
messaging_email_preference,
181187
messaging_email_urgent_all,
182188
messaging_email_ts)
183-
VALUES (4,'bob','[email protected]','','',NULL,NULL,'Bob','User','',0,0,'2017-02-02 14:20:20','2017-02-02 14:28:33','2017-02-02 14:28:24','2017-02-02 14:28:33','2017-02-02 14:28:24',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','5OMDTXHZYMX62IQJ',1,1,2,NULL,'X_HOURS',1,NULL);
189+
VALUES (4,'bob','[email protected]','','',NULL,NULL,'Bob','User','',0,0,'2017-02-02 14:20:20','2017-02-02 14:28:33','2017-02-02 14:28:24','2017-02-02 14:28:33','2017-02-02 14:28:24',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','5OMDTXHZYMX62IQJ',1,1,2,NULL,'NONE',1,NULL);
190+
191+
REPLACE INTO `redcap_user_information`
192+
(ui_id,username,user_email,user_email2,user_email3,user_phone,user_phone_sms,user_firstname,user_lastname,user_inst_id,super_user,account_manager,user_creation,user_firstvisit,user_firstactivity,user_lastactivity,user_lastlogin,user_suspended_time,user_expiration,user_access_dashboard_view,user_access_dashboard_email_queued,user_sponsor,user_comments,allow_create_db,email_verify_code,email2_verify_code,email3_verify_code,datetime_format,number_format_decimal,number_format_thousands_sep,two_factor_auth_secret,display_on_email_users,two_factor_auth_twilio_prompt_phone,two_factor_auth_code_expiration,api_token,messaging_email_preference,messaging_email_urgent_all,messaging_email_ts)
193+
VALUES (5,'carol','[email protected]','','',NULL,NULL,'Carol','User','',0,0,'2017-02-02 14:20:20','2017-02-02 14:28:33','2017-02-02 14:28:24','2017-02-02 14:28:33','2017-02-02 14:28:24',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','5OMDTXHZYMX62IQJ',1,1,2,NULL,'NONE',1,NULL);
194+
195+
REPLACE INTO `redcap_user_information`
196+
(ui_id,username,user_email,user_email2,user_email3,user_phone,user_phone_sms,user_firstname,user_lastname,user_inst_id,super_user,account_manager,user_creation,user_firstvisit,user_firstactivity,user_lastactivity,user_lastlogin,user_suspended_time,user_expiration,user_access_dashboard_view,user_access_dashboard_email_queued,user_sponsor,user_comments,allow_create_db,email_verify_code,email2_verify_code,email3_verify_code,datetime_format,number_format_decimal,number_format_thousands_sep,two_factor_auth_secret,display_on_email_users,two_factor_auth_twilio_prompt_phone,two_factor_auth_code_expiration,api_token,messaging_email_preference,messaging_email_urgent_all,messaging_email_ts)
197+
VALUES (6,'dan','[email protected]','','',NULL,NULL,'Dan','User','',0,0,'2017-02-02 14:20:20','2017-02-02 14:28:33','2017-02-02 14:28:24','2017-02-02 14:28:33','2017-02-02 14:28:24',NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,'M/D/Y_12','.',',','5OMDTXHZYMX62IQJ',1,1,2,NULL,'NONE',1,NULL);

deploy/hooks/redcap_data_entry_form/complex_validation/deploy.sh renamed to deploy/hooks/complex_validation/deploy.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
set -e
33

44
export MYTARGETDIR=$1
5+
MYHOOK=$MYTARGETDIR/redcap_data_entry_form
56

67
# determine the directory where this script resides
78
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -11,7 +12,7 @@ TEMPDIR=`mktemp -d`
1112
git clone https://github.com/ctsit/redcap-data-entry-form_complex-validation-hook.git $TEMPDIR
1213

1314
# copy files to the correct target locations
14-
mkdir -p $MYTARGETDIR
15-
cp $TEMPDIR/complex_validation.php $MYTARGETDIR
15+
mkdir -p $MYHOOK
16+
cp $TEMPDIR/complex_validation.php $MYHOOK
1617

1718
rm -rf $TEMPDIR

‎deploy/hooks/custom_project_settings/deploy.sh‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/bash
2+
set -e
3+
4+
export MYTARGETDIR=$1
5+
MYHOOK=$MYTARGETDIR/redcap_every_page_top
6+
7+
8+
# determine the directory where this script resides
9+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
10+
11+
# get source files
12+
TEMPDIR=`mktemp -d`
13+
git clone [email protected]:ctsit/custom_project_settings.git $TEMPDIR
14+
15+
16+
# If you need to checkout code from another branch, uncomment and adjust this line
17+
# git --git-dir=$TEMPDIR/.git --work-tree=$TEMPDIR checkout develop
18+
19+
# copy files to the correct target locations
20+
mkdir -p $MYHOOK
21+
cp $TEMPDIR/cps_hook.php $MYHOOK
22+
23+
rm -rf $TEMPDIR

deploy/hooks/redcap_every_page_top/form_render_skip_logic/deploy.sh renamed to deploy/hooks/form_render_skip_logic/deploy.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@
22
set -e
33

44
export MYTARGETDIR=$1
5+
MYHOOK=$MYTARGETDIR/redcap_every_page_top
56

67
# determine the directory where this script resides
78
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
89

910
# get source files
1011
TEMPDIR=`mktemp -d`
11-
git clone ssh://[email protected]/form_render_skip_logic.git $TEMPDIR
12+
git clone https://github.com/ctsit/form_render_skip_logic.git $TEMPDIR
1213

1314
# If you need to checkout code from another branch, uncomment and adjust this line
1415
# git --git-dir=$TEMPDIR/.git --work-tree=$TEMPDIR checkout develop
1516

1617
# copy files to the correct target locations
1718
mkdir -p $MYTARGETDIR
18-
cp $TEMPDIR/frsl_data_collection_instruments.php $MYTARGETDIR
19-
cp $TEMPDIR/frsl_record_home_page.php $MYTARGETDIR
20-
cp $TEMPDIR/frsl_dashboard.php $MYTARGETDIR
19+
cp $TEMPDIR/frsl_data_collection_instruments.php $MYHOOK
20+
cp $TEMPDIR/frsl_record_home_page.php $MYHOOK
21+
cp $TEMPDIR/frsl_dashboard.php $MYHOOK
2122

2223
rm -rf $TEMPDIR

‎deploy/hooks/linear_data_entry_workflow/deploy.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
set -e
3+
4+
export MYTARGETDIR=$1
5+
6+
# determine the directory where this script resides
7+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
8+
9+
# get source files
10+
TEMPDIR=`mktemp -d`
11+
git clone [email protected]:ctsit/linear_data_entry_workflow.git $TEMPDIR
12+
13+
# If you need to checkout code from another branch, uncomment and adjust this line
14+
git --git-dir=$TEMPDIR/.git --work-tree=$TEMPDIR checkout develop
15+
16+
# copy files to the correct target locations
17+
HOOK_FUNCTION_DIR=$MYTARGETDIR/redcap_data_entry_form
18+
mkdir -p $HOOK_FUNCTION_DIR
19+
cp $TEMPDIR/copy_values_from_previous_event.php $HOOK_FUNCTION_DIR
20+
cp $TEMPDIR/force_data_entry_constraints.php $HOOK_FUNCTION_DIR
21+
cp $TEMPDIR/default_from_field.php $HOOK_FUNCTION_DIR
22+
cp $TEMPDIR/rfio_data_entry.php $HOOK_FUNCTION_DIR
23+
24+
HOOK_FUNCTION_DIR=$MYTARGETDIR/redcap_every_page_top
25+
mkdir -p $HOOK_FUNCTION_DIR
26+
cp $TEMPDIR/rfio_dashboard.php $HOOK_FUNCTION_DIR
27+
cp $TEMPDIR/rfio_record_home.php $HOOK_FUNCTION_DIR
28+
cp $TEMPDIR/default_from_field_help.php $HOOK_FUNCTION_DIR
29+
30+
rm -rf $TEMPDIR

0 commit comments

Comments
 (0)