Skip to content

yotta / pictogram

Go to a project
Commit c0fd17ec by Arturo Montejo Ráez
Options

TPV disabled

parent 217c5709
Inline Side-by-side
Showing with 17 additions and 18 deletions
sails/cron/logrotate.conf
/home/ubuntu/pictogram/sails/logs/access.json /home/ubuntu/pictogram/sails/logs/error.json /home/ubuntu/pictogram/sails/logs/debug.json /home/ubuntu/pictogram/sails/logs/silly.json /home/ubuntu/pictogram/sails/logs/info.json { /var/log/pictogramapp-check.log /home/ubuntu/pictogram/sails/logs/access.json /home/ubuntu/pictogram/sails/logs/error.json /home/ubuntu/pictogram/sails/logs/debug.json /home/ubuntu/pictogram/sails/logs/silly.json /home/ubuntu/pictogram/sails/logs/info.json {
size 1k size 1k
rotate 7 rotate 7
dateext dateext
......
sails/cron/renewcerts.sh 100644 → 100755
#!/bin/bash #!/bin/bash
# Renew certs # Renew certs
/home/ubuntu/letsencrypt/letsencrypt-auto --config /etc/letsencrypt/cli.ini -d login.pictogramweb.com -d api.pictogramweb.com -d app.pictogramweb.com -d pre.yottacode.com -d pictogram.yottacode.com -d apk.pictogramweb.com certonly /home/ubuntu/letsencrypt/letsencrypt-auto --config /etc/letsencrypt/cli.ini -d api.pictogramweb.com -d app.pictogramweb.com -d pre.yottacode.com -d pictogram.yottacode.com -d apk.pictogramweb.com certonly
# Reload Sails # Reload Sails
(cd /home/ubuntu/pictogram/sails/src; /usr/bin/forever stopall; /usr/bin/forever start app.js) (cd /home/ubuntu/pictogram/sails/src; /usr/bin/forever stopall; /usr/bin/forever start app.js)
......
sails/src/assets/scripts/modules/student/views/setup.html
...@@ -80,7 +80,8 @@ ...@@ -80,7 +80,8 @@
<div class="row"> <div class="row">
<div class="col-xs-2"><i class="fa fa-certificate fa-lg text-danger" aria-hidden="true"></i></div> <div class="col-xs-2"><i class="fa fa-certificate fa-lg text-danger" aria-hidden="true"></i></div>
<div class="col-xs-10"> <div class="col-xs-10">
{{ 'license_expired_official' | translate }} <a ng-click="openBuyModal()">{{ 'license_expired_renew' | translate }}</a>. {{ 'license_expired_official' | translate }} <a href="mailto:info@yottacode.com">{{ 'license_expired_renew' | translate }}</a>.
<!-- disable TPV {{ 'license_expired_official' | translate }} <a ng-click="openBuyModal()">{{ 'license_expired_renew' | translate }}</a>. -->
</div> </div>
</div> </div>
</div> </div>
...@@ -90,7 +91,8 @@ ...@@ -90,7 +91,8 @@
<div class="row"> <div class="row">
<div class="col-xs-2"><i class="fa fa-flask fa-lg text-danger" aria-hidden="true"></i></div> <div class="col-xs-2"><i class="fa fa-flask fa-lg text-danger" aria-hidden="true"></i></div>
<div class="col-xs-10"> <div class="col-xs-10">
{{ 'license_expired_trial' | translate }} <a ng-click="openBuyModal()">{{ 'license_expired_buy' | translate }} <!-- disable TPV {{ 'license_expired_trial' | translate }} <a ng-click="openBuyModal()">{{ 'license_expired_buy' | translate }} -->
{{ 'license_expired_trial' | translate }} <a href="mailto:info@yottacode.com">{{ 'license_expired_buy' | translate }}
</a> </a>
</div> </div>
</div> </div>
......
sails/src/config/cors.js
...@@ -37,7 +37,7 @@ module.exports.cors = { ...@@ -37,7 +37,7 @@ module.exports.cors = {
* * * *
***************************************************************************/ ***************************************************************************/
// allRoutes: false, allRoutes: true,
/*************************************************************************** /***************************************************************************
* * * *
...@@ -47,7 +47,7 @@ module.exports.cors = { ...@@ -47,7 +47,7 @@ module.exports.cors = {
* * * *
***************************************************************************/ ***************************************************************************/
// origin: '*', origin: '*',
/*************************************************************************** /***************************************************************************
* * * *
...@@ -55,7 +55,7 @@ module.exports.cors = { ...@@ -55,7 +55,7 @@ module.exports.cors = {
* * * *
***************************************************************************/ ***************************************************************************/
// credentials: true, credentials: true,
/*************************************************************************** /***************************************************************************
* * * *
...@@ -64,7 +64,7 @@ module.exports.cors = { ...@@ -64,7 +64,7 @@ module.exports.cors = {
* * * *
***************************************************************************/ ***************************************************************************/
// methods: 'GET, POST, PUT, DELETE, OPTIONS, HEAD', methods: 'GET, POST, PUT, DELETE, OPTIONS, PATCH, HEAD',
/*************************************************************************** /***************************************************************************
* * * *
...@@ -73,6 +73,6 @@ module.exports.cors = { ...@@ -73,6 +73,6 @@ module.exports.cors = {
* * * *
***************************************************************************/ ***************************************************************************/
// headers: 'content-type' headers: 'content-type, authorization'
}; };
sails/src/config/local.js~
...@@ -36,16 +36,13 @@ module.exports = { ...@@ -36,16 +36,13 @@ module.exports = {
* responses over https:// and/or use websockets over the wss:// protocol * responses over https:// and/or use websockets over the wss:// protocol
* (recommended for HTTP, strongly encouraged for WebSockets) * (recommended for HTTP, strongly encouraged for WebSockets)
*/ */
/* ssl: {
// ca: fs.readFileSync(path.join(__dirname, 'ssl', 'bundle.crt')),
key: fs.readFileSync(path.join(__dirname, 'ssl', 'yottacode.com.key')),
cert: fs.readFileSync(path.join(__dirname, 'ssl', 'yottacode.com.crt')),
},
*/
ssl: { ssl: {
key: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/privkey.pem'), // ca: fs.readFileSync(path.join(__dirname, 'ssl', 'development-bundle.crt')),
cert: fs.readFileSync('/etc/letsencrypt/live/dev.yottacode.com/cert.pem') key: fs.readFileSync('/etc/letsencrypt/live/pre.yottacode.com/privkey.pem'),
} cert: fs.readFileSync('/etc/letsencrypt/live/pre.yottacode.com/fullchain.pem')
},
/** /**
* The `port` setting determines which TCP port your app will be * The `port` setting determines which TCP port your app will be
* deployed on. * deployed on.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment