Skip to content

Commit

Permalink
fixed .travis.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
weichaoduo committed Nov 13, 2018
1 parent 405a160 commit ed68bc9
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ script:
- echo $TRAVIS_BUILD_DIR
- git checkout travis
- git pull origin travis
- cp -f env.ini-travis env.ini
- composer update
- ls
- chmod +x /home/travis/build/gopeak/masterlab/travis/install-nginx.sh
- /home/travis/build/gopeak/masterlab/travis/install-nginx.sh
- cat /home/travis/build/gopeak/masterlab/travis/nginx/nginx.conf

- curl -vsf 'http://masterlab.ci:8080/index.php' &> /dev/stdout
- cat /tmp/error.log
Expand Down
10 changes: 5 additions & 5 deletions app/config/deploy/mail.cfg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
$_config = array(


'host' => 'smtp.vip.163.com',
'host' => 'smtpdm.aliyun.com',
'port' => 25,
'from' => array('address' => '[email protected]', 'name' => 'Administrator'),
'from' => array('address' => '[email protected]', 'name' => 'MasterlabSender'),
'encryption' => 'ssl',
'username' => '[email protected]',
'password' => 'xxx163vip',
'username' => '[email protected]',
'password' => 'MasterLab123456',
'sendmail' => '/usr/sbin/sendmail -bs',
// 管理员邮箱
'amdin_email' => '[email protected]',
'amdin_email' => '[email protected]',
'timeout'=>16
);

Expand Down
10 changes: 5 additions & 5 deletions app/config/remote/mail.cfg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
$_config = array(


'host' => 'smtp.vip.163.com',
'host' => 'smtpdm.aliyun.com',
'port' => 25,
'from' => array('address' => '[email protected]', 'name' => 'Administrator'),
'from' => array('address' => '[email protected]', 'name' => 'MasterlabSender'),
'encryption' => 'ssl',
'username' => '[email protected]',
'password' => 'ismond163vip',
'username' => '[email protected]',
'password' => 'MasterLab123456',
'sendmail' => '/usr/sbin/sendmail -bs',
// 管理员邮箱
'amdin_email' => '[email protected]',
'amdin_email' => '[email protected]',
'timeout'=>16
);

Expand Down
10 changes: 5 additions & 5 deletions app/config/travis/mail.cfg.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
$_config = array(


'host' => 'smtp.vip.163.com',
'host' => 'smtpdm.aliyun.com',
'port' => 25,
'from' => array('address' => '[email protected]', 'name' => 'Administrator'),
'from' => array('address' => '[email protected]', 'name' => 'MasterlabSender'),
'encryption' => 'ssl',
'username' => '[email protected]',
'password' => 'xxx163vip',
'username' => '[email protected]',
'password' => 'MasterLab123456',
'sendmail' => '/usr/sbin/sendmail -bs',
// 管理员邮箱
'amdin_email' => '[email protected]',
'amdin_email' => '[email protected]',
'timeout'=>16
);

Expand Down
7 changes: 7 additions & 0 deletions env.ini-travis
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; envionment variables list
; 线上部署、测试环境、开发环境的相关配置
; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

; 项目状态:deploy | development
APP_STATUS = travis

0 comments on commit ed68bc9

Please sign in to comment.