Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25a8495c5c | ||
|
|
0dd8a47c51 | ||
|
|
6e07f1ad0b | ||
|
|
eb643bcb79 | ||
|
|
b1a33940ff | ||
|
|
b9be324698 | ||
|
|
40d0e6071a | ||
|
|
60dfebc676 | ||
|
|
0479701b70 | ||
|
|
f80dc6ec64 | ||
|
|
fc63d04c6b | ||
|
|
0cbf98d43e | ||
|
|
0359e12555 | ||
|
|
83e17cec7c | ||
|
|
05e4c00b7f | ||
|
|
69eb59b93b | ||
|
|
4883c53419 | ||
|
|
a0bafc453f | ||
|
|
b515760e6d | ||
|
|
ea4e0c0ec3 | ||
|
|
3f04905d22 | ||
|
|
0ab6391bf3 | ||
|
|
a66dfa8530 | ||
|
|
09cf83c31b |
@@ -36,7 +36,7 @@ $currentSystem->apache->user = "var-www";
|
|||||||
$currentSystem->apache->group = "var-www";
|
$currentSystem->apache->group = "var-www";
|
||||||
$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html
|
$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html
|
||||||
|
|
||||||
$currentSystem->remoteLocationPath = getenv('ASD_PUBLIC_URL')."/";
|
$currentSystem->remoteLocationPath = getenv('DDNINJA_PUBLIC_URL')."/";
|
||||||
|
|
||||||
// Deprecato in quanto CBS2 è stato dismesso
|
// Deprecato in quanto CBS2 è stato dismesso
|
||||||
$backupSystem = new stdClass();
|
$backupSystem = new stdClass();
|
||||||
@@ -134,7 +134,7 @@ $config->database = $database;
|
|||||||
|
|
||||||
$config->mailer = new stdClass();
|
$config->mailer = new stdClass();
|
||||||
$config->mailer->address = "email-smtp.eu-west-1.amazonaws.com";
|
$config->mailer->address = "email-smtp.eu-west-1.amazonaws.com";
|
||||||
$config->mailer->port = "25";
|
$config->mailer->port = "587";
|
||||||
$config->mailer->username = "AKIASMB7IW2MQPUP5CXS";
|
$config->mailer->username = "AKIASMB7IW2MQPUP5CXS";
|
||||||
$config->mailer->password = "BHv+82Nns1kIKg99Hx0sjKlEpR+X4+1EgX+ec64n/mBt";
|
$config->mailer->password = "BHv+82Nns1kIKg99Hx0sjKlEpR+X4+1EgX+ec64n/mBt";
|
||||||
$config->mailer->smtpAuth = true;
|
$config->mailer->smtpAuth = true;
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ $currentSystem->apache->user = "var-www";
|
|||||||
$currentSystem->apache->group = "var-www";
|
$currentSystem->apache->group = "var-www";
|
||||||
$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html
|
$currentSystem->apache->workdir = "/var/www"; // Il path in cui inserire la cartella con le pagine html
|
||||||
|
|
||||||
$currentSystem->remoteLocationPath = "http://www.ifattidinapoli.it/";
|
$currentSystem->remoteLocationPath = "https://www.ifattidinapoli.it/";
|
||||||
|
|
||||||
$backupSystem = new stdClass();
|
$backupSystem = new stdClass();
|
||||||
$backupSystem->account = "1582528f056a7ea7f391149fddc75553";
|
$backupSystem->account = "1582528f056a7ea7f391149fddc75553";
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ class BannerHelper {
|
|||||||
|
|
||||||
|
|
||||||
private static function getBannerImpressions($bannerIds) {
|
private static function getBannerImpressions($bannerIds) {
|
||||||
$time = strtotime("today CET");
|
$time = strtotime("today");
|
||||||
$stats = GlobalVariables::get("dao")->query(
|
$stats = GlobalVariables::get("dao")->query(
|
||||||
BannerStatsModel::class,
|
BannerStatsModel::class,
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -9,11 +9,11 @@ class FDN_MailHelper {
|
|||||||
public static function generateMailFooter(){
|
public static function generateMailFooter(){
|
||||||
$footer = '<div style="background-color:#14477c;height:177px;margin-top:10px;">'.
|
$footer = '<div style="background-color:#14477c;height:177px;margin-top:10px;">'.
|
||||||
'<div style="text-align:center;color:#2e91d4;padding:10px;">'.
|
'<div style="text-align:center;color:#2e91d4;padding:10px;">'.
|
||||||
'<a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/index.php">Home</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/categorySummary.php?category=1>">Politica</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/categorySummary.php?category=2>">Cronaca</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/categorySummary.php?category=3>">Sport</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/categorySummary.php?category=4>">Cultura&Spettacolo</a> | <a style="color:#2e91d4;margin:10px;" href="http://www.ifattidinapoli.it/categorySummary.php?category=5>">Gossip</a>'.
|
'<a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/index.php">Home</a> | <a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/categorySummary.php?category=1>">Politica</a> | <a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/categorySummary.php?category=2>">Cronaca</a> | <a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/categorySummary.php?category=3>">Sport</a> | <a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/categorySummary.php?category=4>">Cultura&Spettacolo</a> | <a style="color:#2e91d4;margin:10px;" href="https://www.ifattidinapoli.it/categorySummary.php?category=5>">Gossip</a>'.
|
||||||
'</div>'.
|
'</div>'.
|
||||||
'<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>'.
|
'<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>'.
|
||||||
'<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT © 2016 <a href="http://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>'.
|
'<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT © 2016 <a href="https://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>'.
|
||||||
'<div style="text-align:center;color:white;margin-top:20px;"><a href="http://www.ifattidinapoli.it/redazione.php" style="color:white;">REDAZIONE</a> | <a href="http://www.ifattidinapoli.it/archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>'.
|
'<div style="text-align:center;color:white;margin-top:20px;"><a href="https://www.ifattidinapoli.it/redazione.php" style="color:white;">REDAZIONE</a> | <a href="https://www.ifattidinapoli.it/archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>'.
|
||||||
'</div>';
|
'</div>';
|
||||||
return $footer;
|
return $footer;
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@ class FDN_MailHelper {
|
|||||||
|
|
||||||
$confirmLink = GUIHandler::getBaseUrl()."admin/confirmAdmin.php?regcode=".$admin->id."&email=".$admin->email;
|
$confirmLink = GUIHandler::getBaseUrl()."admin/confirmAdmin.php?regcode=".$admin->id."&email=".$admin->email;
|
||||||
|
|
||||||
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
||||||
$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
|
$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
|
||||||
$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter().'</div>';
|
$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter().'</div>';
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ class FDN_MailHelper {
|
|||||||
|
|
||||||
$confirmLink = GUIHandler::getBaseUrl()."admin/passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
|
$confirmLink = GUIHandler::getBaseUrl()."admin/passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
|
||||||
|
|
||||||
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
||||||
|
|
||||||
$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
|
$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
|
||||||
$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
|
$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
|
||||||
@@ -70,7 +70,7 @@ class FDN_MailHelper {
|
|||||||
|
|
||||||
$confirmLink = GUIHandler::getBaseUrl()."confirmUser.php?regcode=".$user->id."&email=".$user->email;
|
$confirmLink = GUIHandler::getBaseUrl()."confirmUser.php?regcode=".$user->id."&email=".$user->email;
|
||||||
|
|
||||||
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
||||||
$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
|
$tmp->body = $mailHead."Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.<br/><br/>";
|
||||||
$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter().'</div>';
|
$tmp->body.='<a href="'.$confirmLink.'">'.$confirmLink.'</a><br/>'.self::generateMailFooter().'</div>';
|
||||||
|
|
||||||
@@ -90,7 +90,7 @@ class FDN_MailHelper {
|
|||||||
|
|
||||||
$confirmLink = GUIHandler::getBaseUrl()."passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
|
$confirmLink = GUIHandler::getBaseUrl()."passwordRecovery.php?req=".$request->id."&u=".$request->target->id;
|
||||||
|
|
||||||
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
||||||
|
|
||||||
$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
|
$tmp->body = $mailHead."Hai ricevuto questo messaggio perchè hai effettuato una richiesta di recupero password dal nostro sito.<br/><br/>";
|
||||||
$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
|
$tmp->body.= "Se non hai effettuato nessuna richiesta, semplicemente ignora questo messaggio.<br/><br/>";
|
||||||
@@ -111,7 +111,7 @@ class FDN_MailHelper {
|
|||||||
|
|
||||||
$confirmLink = GUIHandler::getBaseUrl()."/admin/validateCommento.php?i=".$commento->id;
|
$confirmLink = GUIHandler::getBaseUrl()."/admin/validateCommento.php?i=".$commento->id;
|
||||||
|
|
||||||
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
$mailHead = '<div style="width:1024px; margin:auto;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png" alt="" /><div><br/><br/>';
|
||||||
|
|
||||||
$tmp->body = $mailHead."Un nuovo commento è stato inserito su I Fatti di Napoli ed è in attesa di essere accettato.<br/><br/>";
|
$tmp->body = $mailHead."Un nuovo commento è stato inserito su I Fatti di Napoli ed è in attesa di essere accettato.<br/><br/>";
|
||||||
$tmp->body.= "Verifica i contenuti del commento utilizzando il link di seguito.<br/><br/>";
|
$tmp->body.= "Verifica i contenuti del commento utilizzando il link di seguito.<br/><br/>";
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ class PipelineHelper {
|
|||||||
'statType'=>StatisticModel::STAT_TYPE_BANNER_IMPRESSION,
|
'statType'=>StatisticModel::STAT_TYPE_BANNER_IMPRESSION,
|
||||||
'content.position'=>$position,
|
'content.position'=>$position,
|
||||||
// 'date'=>array( '$gte'=>new MongoDate(strtotime("today")) )
|
// 'date'=>array( '$gte'=>new MongoDate(strtotime("today")) )
|
||||||
'date'=>array( '$gte'=>new MongoDB\BSON\UTCDateTime(strtotime("today CET") * 1000) )
|
'date'=>array( '$gte'=>new MongoDB\BSON\UTCDateTime(strtotime("today") * 1000) )
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
|
|||||||
@@ -49,10 +49,8 @@ class MailModel extends Model implements FDN_MailInterface{
|
|||||||
$email->isMail();
|
$email->isMail();
|
||||||
|
|
||||||
$email->From = $this->from;
|
$email->From = $this->from;
|
||||||
if ($this->hasProperty("fromName")){
|
$email->FromName = "I Fatti di Napoli";
|
||||||
$email->FromName = $this->fromName;
|
|
||||||
}
|
|
||||||
|
|
||||||
$email->Subject = $this->subject;
|
$email->Subject = $this->subject;
|
||||||
|
|
||||||
$email->IsHTML(true);
|
$email->IsHTML(true);
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class ArticleStatsModel extends Model {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static function getFilter($articleId, $day, $month, $year) {
|
public static function getFilter($articleId, $day, $month, $year) {
|
||||||
$time = strtotime("$year-$month-$day CET");
|
$time = strtotime("$year-$month-$day");
|
||||||
return [
|
return [
|
||||||
'notizia' => $articleId,
|
'notizia' => $articleId,
|
||||||
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ class BannerStatsModel extends Model {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static function new($bannerId, $day, $month, $year) {
|
public static function new($bannerId, $day, $month, $year) {
|
||||||
$time = strtotime("$year-$month-$day CET");
|
$time = strtotime("$year-$month-$day");
|
||||||
return new static(
|
return new static(
|
||||||
(object)[
|
(object)[
|
||||||
'banner' => $bannerId,
|
'banner' => $bannerId,
|
||||||
@@ -30,7 +30,7 @@ class BannerStatsModel extends Model {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
public static function getFilter($bannerId, $day, $month, $year) {
|
public static function getFilter($bannerId, $day, $month, $year) {
|
||||||
$time = strtotime("$year-$month-$day CET");
|
$time = strtotime("$year-$month-$day");
|
||||||
return [
|
return [
|
||||||
'banner' => $bannerId,
|
'banner' => $bannerId,
|
||||||
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class PageViewStatsModel extends Model {
|
|||||||
return "pageview_stats";
|
return "pageview_stats";
|
||||||
}
|
}
|
||||||
public static function new($page, $day, $month, $year) {
|
public static function new($page, $day, $month, $year) {
|
||||||
$time = strtotime("$year-$month-$day CET");
|
$time = strtotime("$year-$month-$day");
|
||||||
|
|
||||||
return new static(
|
return new static(
|
||||||
(object)[
|
(object)[
|
||||||
@@ -33,7 +33,7 @@ class PageViewStatsModel extends Model {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static function getFilter($page, $day, $month, $year) {
|
public static function getFilter($page, $day, $month, $year) {
|
||||||
$time = strtotime("$year-$month-$day CET");
|
$time = strtotime("$year-$month-$day");
|
||||||
return [
|
return [
|
||||||
'page' => $page,
|
'page' => $page,
|
||||||
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
'time' => new MongoDB\BSON\UTCDateTime( $time * 1000 ),
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ class GUIHandler {
|
|||||||
}
|
}
|
||||||
echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=Edge,chrome=1\">\n";
|
echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=Edge,chrome=1\">\n";
|
||||||
echo '<link rel="shortcut icon" href="images/favicon.ico">'."\n";
|
echo '<link rel="shortcut icon" href="images/favicon.ico">'."\n";
|
||||||
echo '<link href="http://fonts.googleapis.com/css?family=Lato&subset=latin,latin-ext" rel="stylesheet" type="text/css">'."\n";
|
echo '<link href="https://fonts.googleapis.com/css?family=Lato&subset=latin,latin-ext" rel="stylesheet" type="text/css">'."\n";
|
||||||
echo '<META http-equiv="Cache-Control" content="no-cache,no-store" />'."\n";
|
echo '<META http-equiv="Cache-Control" content="no-cache,no-store" />'."\n";
|
||||||
echo '<META http-equiv="Pragma" content="no-cache" />'."\n";
|
echo '<META http-equiv="Pragma" content="no-cache" />'."\n";
|
||||||
if (array_key_exists("additionalMetadata", $data) && is_array($data["additionalMetadata"]) && sizeof($data["additionalMetadata"])>0){
|
if (array_key_exists("additionalMetadata", $data) && is_array($data["additionalMetadata"]) && sizeof($data["additionalMetadata"])>0){
|
||||||
@@ -215,7 +215,7 @@ class GUIHandler {
|
|||||||
<div class="leftBanner topBanner mediaContent">
|
<div class="leftBanner topBanner mediaContent">
|
||||||
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
|
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
|
||||||
</div>
|
</div>
|
||||||
<div class="logo"><a href="http://ifattidinapoli.it/index.php"><img src="http://ifattidinapoli.it/images/logo_uff.png"></a></div>
|
<div class="logo"><a href="https://www.ifattidinapoli.it/index.php"><img src="https://www.ifattidinapoli.it/images/logo_uff.png"></a></div>
|
||||||
<div class="rightBanner topBanner mediaContent">
|
<div class="rightBanner topBanner mediaContent">
|
||||||
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
|
<?php BannerHelper::printBanner(BannerModel::POSITION_HEAD);?>
|
||||||
</div>
|
</div>
|
||||||
@@ -348,7 +348,7 @@ class GUIHandler {
|
|||||||
?>
|
?>
|
||||||
</div>
|
</div>
|
||||||
<div >TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
|
<div >TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
|
||||||
<div >COPYRIGHT © 2016 <a href="http://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
|
<div >COPYRIGHT © 2016 <a href="https://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
|
||||||
<div ><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
|
<div ><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -358,22 +358,22 @@ class GUIHandler {
|
|||||||
|
|
||||||
public static function getFacebookShareFunction(NotiziaModel $notizia){
|
public static function getFacebookShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getTwitterShareFunction(NotiziaModel $notizia){
|
public static function getTwitterShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."articolo.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."articolo.php?id=".$notizia->id;
|
||||||
return 'window.open("http://twitter.com/home?source=ifdn&status="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://twitter.com/home?source=ifdn&status="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getGooglePlusShareFunction(NotiziaModel $notizia){
|
public static function getGooglePlusShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getLinkedinShareFunction(NotiziaModel $notizia){
|
public static function getLinkedinShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -381,7 +381,7 @@ class GUIHandler {
|
|||||||
|
|
||||||
$stats = GlobalVariables::get("dao")->aggregate(
|
$stats = GlobalVariables::get("dao")->aggregate(
|
||||||
ArticleStatsModel::class,
|
ArticleStatsModel::class,
|
||||||
PipelineHelper::getMostViewedOfLastDays(strtotime("-7 days CET"),5)
|
PipelineHelper::getMostViewedOfLastDays(strtotime("-7 days"),5)
|
||||||
);
|
);
|
||||||
$idArray = array_map(function ($ele){ return new MongoDB\BSON\ObjectID($ele["notizia"]);}, $stats);
|
$idArray = array_map(function ($ele){ return new MongoDB\BSON\ObjectID($ele["notizia"]);}, $stats);
|
||||||
|
|
||||||
@@ -449,19 +449,16 @@ class GUIHandler {
|
|||||||
|
|
||||||
public static function generateGoogleAnalyticsScripts(){
|
public static function generateGoogleAnalyticsScripts(){
|
||||||
?>
|
?>
|
||||||
<script>
|
<!-- Google tag (gtag.js) -->
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5YTMS8G32Q"></script>
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
<script>
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
window.dataLayer = window.dataLayer || [];
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
function gtag(){dataLayer.push(arguments);}
|
||||||
|
gtag('js', new Date());
|
||||||
// ga('create', 'UA-75287906-1', 'auto');
|
|
||||||
// ga('send', 'pageview');
|
gtag('config', 'G-5YTMS8G32Q');
|
||||||
|
</script>
|
||||||
|
|
||||||
ga('create', 'UA-6137905-1', 'auto');
|
|
||||||
ga('send', 'pageview');
|
|
||||||
|
|
||||||
</script>
|
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class GUIHandlerMobile {
|
|||||||
}
|
}
|
||||||
echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=Edge,chrome=1\">\n";
|
echo "<meta http-equiv=\"X-UA-Compatible\" content=\"IE=Edge,chrome=1\">\n";
|
||||||
echo '<link rel="shortcut icon" href="images/favicon.ico">'."\n";
|
echo '<link rel="shortcut icon" href="images/favicon.ico">'."\n";
|
||||||
echo '<link href="http://fonts.googleapis.com/css?family=Lato&subset=latin,latin-ext" rel="stylesheet" type="text/css">'."\n";
|
echo '<link href="https://fonts.googleapis.com/css?family=Lato&subset=latin,latin-ext" rel="stylesheet" type="text/css">'."\n";
|
||||||
echo '<META http-equiv="Cache-Control" content="no-cache,no-store" />'."\n";
|
echo '<META http-equiv="Cache-Control" content="no-cache,no-store" />'."\n";
|
||||||
echo '<META http-equiv="Pragma" content="no-cache" />'."\n";
|
echo '<META http-equiv="Pragma" content="no-cache" />'."\n";
|
||||||
if (array_key_exists("additionalMetadata", $data) && is_array($data["additionalMetadata"]) && sizeof($data["additionalMetadata"])>0){
|
if (array_key_exists("additionalMetadata", $data) && is_array($data["additionalMetadata"]) && sizeof($data["additionalMetadata"])>0){
|
||||||
@@ -199,7 +199,7 @@ class GUIHandlerMobile {
|
|||||||
<div class="upperBar">
|
<div class="upperBar">
|
||||||
<div class="dateBar"><?php echo $day." ".$mesi[date("n")]." ".date("Y"); ?> - Aggiornato alle <span style="color:#f68235;"><?php echo date("H:i");?></span></div>
|
<div class="dateBar"><?php echo $day." ".$mesi[date("n")]." ".date("Y"); ?> - Aggiornato alle <span style="color:#f68235;"><?php echo date("H:i");?></span></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="logo"><a href="http://ifattidinapoli.com/mobile/index.php"><img src="images/logo_uff.png" /></a></div>
|
<div class="logo"><a href="https://ifattidinapoli.com/mobile/index.php"><img src="images/logo_uff.png" /></a></div>
|
||||||
<div class="bottomBar">
|
<div class="bottomBar">
|
||||||
<img id="menuMobile" alt="" src="images/menuIcon.png">
|
<img id="menuMobile" alt="" src="images/menuIcon.png">
|
||||||
<?php
|
<?php
|
||||||
@@ -369,7 +369,7 @@ class GUIHandlerMobile {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p>TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</p>
|
<p>TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</p>
|
||||||
<p>COPYRIGHT © 2016 <a href="http://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</p>
|
<p>COPYRIGHT © 2016 <a href="https://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</p>
|
||||||
<p><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></p>
|
<p><a href="redazione.php" style="color:white;">REDAZIONE</a> | <a href="archivio.php" style="color:white;">ARCHIVIO STORICO</a></p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -379,22 +379,22 @@ class GUIHandlerMobile {
|
|||||||
|
|
||||||
public static function getFacebookShareFunction(NotiziaModel $notizia){
|
public static function getFacebookShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getTwitterShareFunction(NotiziaModel $notizia){
|
public static function getTwitterShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."articolo.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."articolo.php?id=".$notizia->id;
|
||||||
return 'window.open("http://twitter.com/home?source=ifdn&status="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://twitter.com/home?source=ifdn&status="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getGooglePlusShareFunction(NotiziaModel $notizia){
|
public static function getGooglePlusShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getLinkedinShareFunction(NotiziaModel $notizia){
|
public static function getLinkedinShareFunction(NotiziaModel $notizia){
|
||||||
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
$url = self::getBaseUrl()."fbMetadata.php?id=".$notizia->id;
|
||||||
return 'window.open("http://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
return 'window.open("https://www.facebook.com/sharer.php?u="+encodeURIComponent("'.$url.'"))';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -467,19 +467,16 @@ class GUIHandlerMobile {
|
|||||||
|
|
||||||
public static function generateGoogleAnalyticsScripts(){
|
public static function generateGoogleAnalyticsScripts(){
|
||||||
?>
|
?>
|
||||||
<script>
|
<!-- Google tag (gtag.js) -->
|
||||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
<script async src="https://www.googletagmanager.com/gtag/js?id=G-5YTMS8G32Q"></script>
|
||||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
<script>
|
||||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
window.dataLayer = window.dataLayer || [];
|
||||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
function gtag(){dataLayer.push(arguments);}
|
||||||
|
gtag('js', new Date());
|
||||||
ga('create', 'UA-75287906-1', 'auto');
|
|
||||||
ga('send', 'pageview');
|
gtag('config', 'G-5YTMS8G32Q');
|
||||||
|
</script>
|
||||||
|
|
||||||
ga('create', 'UA-6137905-1', 'auto');
|
|
||||||
ga('send', 'pageview');
|
|
||||||
|
|
||||||
</script>
|
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,12 +40,12 @@ class HTMLHelper {
|
|||||||
$cont = file_get_contents($config->files->meteoCache);
|
$cont = file_get_contents($config->files->meteoCache);
|
||||||
$json = json_decode($cont);
|
$json = json_decode($cont);
|
||||||
|
|
||||||
$todayImgUrl = " http://openweathermap.org/img/w/".$json->list[0]->weather[0]->icon.".png";
|
$todayImgUrl = " https://openweathermap.org/img/w/".$json->list[0]->weather[0]->icon.".png";
|
||||||
$todayTemp = $json->list[0]->main->temp;
|
$todayTemp = $json->list[0]->main->temp;
|
||||||
$todayMax = $json->list[0]->main->temp_max;
|
$todayMax = $json->list[0]->main->temp_max;
|
||||||
$todayMin = $json->list[0]->main->temp_min;
|
$todayMin = $json->list[0]->main->temp_min;
|
||||||
|
|
||||||
$tomorrowImgUrl = " http://openweathermap.org/img/w/".$json->list[1]->weather[0]->icon.".png";
|
$tomorrowImgUrl = " https://openweathermap.org/img/w/".$json->list[1]->weather[0]->icon.".png";
|
||||||
$tomorrowTemp = $json->list[1]->main->temp;
|
$tomorrowTemp = $json->list[1]->main->temp;
|
||||||
$tomorrowMax = $json->list[1]->main->temp_max;
|
$tomorrowMax = $json->list[1]->main->temp_max;
|
||||||
$tomorrowMin = $json->list[1]->main->temp_min;
|
$tomorrowMin = $json->list[1]->main->temp_min;
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ Author: Riccardo Di Dato
|
|||||||
Creation Date: 04/feb/2013
|
Creation Date: 04/feb/2013
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
date_default_timezone_set("Europe/Rome");
|
||||||
|
|
||||||
require_once(dirname(__FILE__)."/common/config.php");
|
require_once(dirname(__FILE__)."/common/config.php");
|
||||||
|
|
||||||
require_once(dirname(__FILE__)."/lib/lib.inclusions.php");
|
require_once(dirname(__FILE__)."/lib/lib.inclusions.php");
|
||||||
|
|||||||
@@ -72,15 +72,15 @@ try {
|
|||||||
|
|
||||||
$mailBody = $mail->body;
|
$mailBody = $mail->body;
|
||||||
if (strcmp($mailBody, "")==0){
|
if (strcmp($mailBody, "")==0){
|
||||||
$mailBody = '<div style="margin:auto;width:1024px;"><div style="text-align:center;"><img src="http://www.ifattidinapoli.it/images/logo_uff.png"></div><div >Testo di prova</div><div></div>'.
|
$mailBody = '<div style="margin:auto;width:1024px;"><div style="text-align:center;"><img src="https://www.ifattidinapoli.it/images/logo_uff.png"></div><div >Testo di prova</div><div></div>'.
|
||||||
'<div style="background-color:#14477c;margin-top:10px;">
|
'<div style="background-color:#14477c;margin-top:10px;">
|
||||||
<div style="text-align:center;color:#2e91d4;padding:10px;">
|
<div style="text-align:center;color:#2e91d4;padding:10px;">
|
||||||
<a style="color:#2e91d4;margin:10px;" href="http://www./index.php">Home</a> | <a style="color:#2e91d4;margin:10px;" href="http://www./categorySummary.php?category=1">Politica</a> | <a style="color:#2e91d4;margin:10px;" href="http://www./categorySummary.php?category=2">Cronaca</a> | <a style="color:#2e91d4;margin:10px;" href="http://www./categorySummary.php?category=3">Sport</a> | <a style="color:#2e91d4;margin:10px;" href="http://www./categorySummary.php?category=4">Cultura&Spettacolo</a>
|
<a style="color:#2e91d4;margin:10px;" href="https://www./index.php">Home</a> | <a style="color:#2e91d4;margin:10px;" href="https://www./categorySummary.php?category=1">Politica</a> | <a style="color:#2e91d4;margin:10px;" href="https://www./categorySummary.php?category=2">Cronaca</a> | <a style="color:#2e91d4;margin:10px;" href="https://www./categorySummary.php?category=3">Sport</a> | <a style="color:#2e91d4;margin:10px;" href="https://www./categorySummary.php?category=4">Cultura&Spettacolo</a>
|
||||||
</div>
|
</div>
|
||||||
<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
|
<div style="text-align:center;color:white;margin-top:25px;">TESTATA REGISTRATA PRESSO IL TRIBUNALE DI NAPOLI AUT. NR. 8 DEL 27 GENNAIO 2006</div>
|
||||||
<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT © 2016 <a href="http://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
|
<div style="text-align:center;color:white;margin-top:20px;">COPYRIGHT © 2016 <a href="https://www.ifattidinapoli.it" style="color:white;">www.ifattidinapoli.it</a> - Giornale della Terza Metropoli Italiana</div>
|
||||||
<div style="text-align:center;color:white;margin-top:20px;">
|
<div style="text-align:center;color:white;margin-top:20px;">
|
||||||
<a href="http://www./redazione.php" style="color:white;">REDAZIONE</a> | <a href="http://www./archivio.php" style="color:white;">ARCHIVIO STORICO</a>
|
<a href="https://www./redazione.php" style="color:white;">REDAZIONE</a> | <a href="https://www./archivio.php" style="color:white;">ARCHIVIO STORICO</a>
|
||||||
</div>
|
</div>
|
||||||
</div></div>';
|
</div></div>';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,13 +72,13 @@ try{
|
|||||||
<div class="bannerStat">
|
<div class="bannerStat">
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Oggi</div>
|
<div class="statName">Oggi</div>
|
||||||
<div>Visualizzazioni: <?php echo AnalyticsHelper::countBannerImpressions($banner->id,strtotime("today CET"));?></div>
|
<div>Visualizzazioni: <?php echo AnalyticsHelper::countBannerImpressions($banner->id,strtotime("today"));?></div>
|
||||||
<div class="toHide">Click: <?php echo AnalyticsHelper::countBannerClicks($banner->id,strtotime("today CET"));?></div>
|
<div class="toHide">Click: <?php echo AnalyticsHelper::countBannerClicks($banner->id,strtotime("today"));?></div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Ultima settimana</div>
|
<div class="statName">Ultima settimana</div>
|
||||||
<div>Visualizzazioni: <?php echo AnalyticsHelper::countBannerImpressions($banner->id,strtotime("-7 days CET"));?></div>
|
<div>Visualizzazioni: <?php echo AnalyticsHelper::countBannerImpressions($banner->id,strtotime("-7 days"));?></div>
|
||||||
<div class="toHide">Click: <?php echo AnalyticsHelper::countBannerClicks($banner->id,strtotime("-7 days CET"));?></div>
|
<div class="toHide">Click: <?php echo AnalyticsHelper::countBannerClicks($banner->id,strtotime("-7 days"));?></div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Totali</div>
|
<div class="statName">Totali</div>
|
||||||
|
|||||||
@@ -144,11 +144,11 @@ try{
|
|||||||
<div class="notiziaStat">
|
<div class="notiziaStat">
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Oggi</div>
|
<div class="statName">Oggi</div>
|
||||||
<div><?php echo AnalyticsHelper::countNotiziaImpressions($notizia->id,strtotime("today CET"));?></div>
|
<div><?php echo AnalyticsHelper::countNotiziaImpressions($notizia->id,strtotime("today"));?></div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Ultima settimana</div>
|
<div class="statName">Ultima settimana</div>
|
||||||
<div><?php echo AnalyticsHelper::countNotiziaImpressions($notizia->id,strtotime("-7 days CET"));?></div>
|
<div><?php echo AnalyticsHelper::countNotiziaImpressions($notizia->id,strtotime("-7 days"));?></div>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<div class="statName">Totali</div>
|
<div class="statName">Totali</div>
|
||||||
|
|||||||
+24
-2
@@ -1,5 +1,5 @@
|
|||||||
const MAX_EXECUTIONS = 12;
|
const MAX_EXECUTIONS = 12;
|
||||||
const ROTATION_INTERVAL = 30000;
|
const ROTATION_INTERVAL = 12000;
|
||||||
|
|
||||||
const executions = {};
|
const executions = {};
|
||||||
|
|
||||||
@@ -41,7 +41,29 @@ function bannerGroup(group, grpName) {
|
|||||||
(target) => {
|
(target) => {
|
||||||
if (rval.length > 0) {
|
if (rval.length > 0) {
|
||||||
const ele = rval.shift();
|
const ele = rval.shift();
|
||||||
$('#'+target).html(ele.media);
|
let mediaHtml = ele.media;
|
||||||
|
if (ele.link) {
|
||||||
|
const a = document.createElement('a');
|
||||||
|
a.href = ele.link;
|
||||||
|
a.target = "_blank";
|
||||||
|
a.innerHTML = ele.media;
|
||||||
|
mediaHtml = a;
|
||||||
|
}
|
||||||
|
mediaHtml.addEventListener(
|
||||||
|
'click',
|
||||||
|
() => {
|
||||||
|
$.ajax({
|
||||||
|
url: "stats/bannerClick.php",
|
||||||
|
method: "POST",
|
||||||
|
data: {
|
||||||
|
banner: ele.id,
|
||||||
|
source: document.URL
|
||||||
|
},
|
||||||
|
dataType: "html"
|
||||||
|
});
|
||||||
|
}
|
||||||
|
);
|
||||||
|
$('#'+target).html(mediaHtml);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
|
|||||||
<div class="imagePreviewAfter"><img src="images/rightImage.png" /></div>
|
<div class="imagePreviewAfter"><img src="images/rightImage.png" /></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="clickableImageContainer" onclick="javascript:hidePreview()"></div> -->
|
<div class="clickableImageContainer" onclick="javascript:hidePreview()"></div> -->
|
||||||
<div style="margin-top:32vw;width:100vw;margin-left:auto;margin-right:auto;" itemscope itemtype="http://schema.org/Article">
|
<div style="margin-top:32vw;width:100vw;margin-left:auto;margin-right:auto;" itemscope itemtype="https://schema.org/Article">
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
$categoryName = NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"];
|
$categoryName = NotiziaModel::$NOTIZIE_CATEGORY[$articolo->category]["label"];
|
||||||
@@ -219,9 +219,9 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
|
|||||||
$twitterCutTitle = substr($twitterCutTitle, 0, 92) . "...";
|
$twitterCutTitle = substr($twitterCutTitle, 0, 92) . "...";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<a class="socialLink" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=http://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>"><div style="background-image:url(images/fb_round.png);"></div></a>
|
<a class="socialLink" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>"><div style="background-image:url(images/fb_round.png);"></div></a>
|
||||||
<a class="socialLink" target="_blank" href="https://twitter.com/intent/tweet?via=fattidinapoli&url=http://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>&text=<?php echo urlencode($twitterCutTitle." -");?>"><div style="background-image:url(images/twitter_round.png);"></div></a>
|
<a class="socialLink" target="_blank" href="https://twitter.com/intent/tweet?via=fattidinapoli&url=https://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>&text=<?php echo urlencode($twitterCutTitle." -");?>"><div style="background-image:url(images/twitter_round.png);"></div></a>
|
||||||
<a class="socialLink" target="_blank" href="https://www.linkedin.com/shareArticle?mini=true&url=http://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>"><div style="background-image:url(images/linkedin_round.png);"></div></a>
|
<a class="socialLink" target="_blank" href="https://www.linkedin.com/shareArticle?mini=true&url=https://www.ifattidinapoli.it/articolo.php?id=<?php echo $articolo->id;?>"><div style="background-image:url(images/linkedin_round.png);"></div></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div style="text-align:center;">
|
<div style="text-align:center;">
|
||||||
@@ -324,7 +324,7 @@ GUIHandlerMobile::generateHtmlHeaders(array("additionalMetadata"=>$additionalHea
|
|||||||
|
|
||||||
<button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
|
<button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
|
||||||
|
|
||||||
<!-- Preloader demo http://codepen.io/dimsemenov/pen/yyBWoR -->
|
<!-- Preloader demo https://codepen.io/dimsemenov/pen/yyBWoR -->
|
||||||
<!-- element will get class pswp__preloader--active when preloader is running -->
|
<!-- element will get class pswp__preloader--active when preloader is running -->
|
||||||
<div class="pswp__preloader">
|
<div class="pswp__preloader">
|
||||||
<div class="pswp__preloader__icn">
|
<div class="pswp__preloader__icn">
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ try {
|
|||||||
<div class="contattiRedazione">
|
<div class="contattiRedazione">
|
||||||
<div >GERENZA</div>
|
<div >GERENZA</div>
|
||||||
<img alt="" src="images/blueBalls.png">
|
<img alt="" src="images/blueBalls.png">
|
||||||
<div><a href="http://www.ifattidinapoli.it">www.ifattidinapoli.it</a></div>
|
<div><a href="https://www.ifattidinapoli.it">www.ifattidinapoli.it</a></div>
|
||||||
<img alt="" src="images/blueBalls.png">
|
<img alt="" src="images/blueBalls.png">
|
||||||
<div >Direttore Responsabile</div>
|
<div >Direttore Responsabile</div>
|
||||||
<div style="font-weight:bold;color:black;">Antonio Pianelli</div>
|
<div style="font-weight:bold;color:black;">Antonio Pianelli</div>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ if (array_key_exists("id", $_GET)){
|
|||||||
|
|
||||||
if (!is_null($notizia)){
|
if (!is_null($notizia)){
|
||||||
Header( "HTTP/1.1 301 Moved Permanently" );
|
Header( "HTTP/1.1 301 Moved Permanently" );
|
||||||
Header( "Location: http://www.ifattidinapoli.it/articolo.php?id=".$notizia->id );
|
Header( "Location: https://www.ifattidinapoli.it/articolo.php?id=".$notizia->id );
|
||||||
|
|
||||||
// GUIHandler::redirect("articolo.php?id=".$notizia->id);
|
// GUIHandler::redirect("articolo.php?id=".$notizia->id);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ try {
|
|||||||
<div class="contattiRedazione">
|
<div class="contattiRedazione">
|
||||||
<div >GERENZA</div>
|
<div >GERENZA</div>
|
||||||
<img alt="" src="images/blueBalls.png">
|
<img alt="" src="images/blueBalls.png">
|
||||||
<div><a href="http://www.ifattidinapoli.it">www.ifattidinapoli.it</a></div>
|
<div><a href="https://www.ifattidinapoli.it">www.ifattidinapoli.it</a></div>
|
||||||
<img alt="" src="images/blueBalls.png">
|
<img alt="" src="images/blueBalls.png">
|
||||||
<div >Direttore Responsabile</div>
|
<div >Direttore Responsabile</div>
|
||||||
<div style="font-weight:bold;color:black;">Antonio Pianelli</div>
|
<div style="font-weight:bold;color:black;">Antonio Pianelli</div>
|
||||||
|
|||||||
@@ -3,4 +3,4 @@ Disallow: /admin/
|
|||||||
Disallow: /stats/
|
Disallow: /stats/
|
||||||
Disallow: /mobile/stats/
|
Disallow: /mobile/stats/
|
||||||
Disallow: /getBanner.php
|
Disallow: /getBanner.php
|
||||||
Sitemap: http://www.ifattidinapoli.it/sitemap.xml
|
Sitemap: https://www.ifattidinapoli.it/sitemap.xml
|
||||||
@@ -17,7 +17,7 @@ try {
|
|||||||
|
|
||||||
if (!is_null($ip) && !is_null($banners) && !is_null($source)){
|
if (!is_null($ip) && !is_null($banners) && !is_null($source)){
|
||||||
$banners = explode(",", $banners);
|
$banners = explode(",", $banners);
|
||||||
$ts = strtotime('today CET');
|
$ts = strtotime('today');
|
||||||
|
|
||||||
foreach ($banners as $banner) {
|
foreach ($banners as $banner) {
|
||||||
AnalyticsHelper::bannerImpression(
|
AnalyticsHelper::bannerImpression(
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
FROM alpine:3.6
|
||||||
|
|
||||||
|
RUN apk add --no-cache --upgrade bash mongodb-tools
|
||||||
|
|
||||||
|
# copy crontabs for root user
|
||||||
|
COPY crontab /etc/crontabs/root
|
||||||
|
|
||||||
|
# copy backup script
|
||||||
|
COPY backup /myscripts/backup
|
||||||
|
RUN chmod 0744 /myscripts/backup
|
||||||
|
|
||||||
|
# start crond with log level 8 in foreground, output to stderr
|
||||||
|
CMD ["crond", "-f", "-d", "8"]
|
||||||
Executable
+24
@@ -0,0 +1,24 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
DATE=`date +"%Y-%m-%d_%H:%M"`
|
||||||
|
|
||||||
|
echo "Generating backup $DATE"
|
||||||
|
|
||||||
|
DATABASE_HOST="fdn2.production.database"
|
||||||
|
DATABASE_NAME="fdn2"
|
||||||
|
DATABASE_PORT="27017"
|
||||||
|
WORKDIR="/workdir"
|
||||||
|
STORAGE="/backups"
|
||||||
|
|
||||||
|
mkdir -p $WORKDIR
|
||||||
|
|
||||||
|
mongodump --host $DATABASE_HOST -d $DATABASE_NAME --port $DATABASE_PORT --out "$WORKDIR"
|
||||||
|
|
||||||
|
tar -cvzf "$STORAGE/dump-$DATE.tar.gz" "$WORKDIR"
|
||||||
|
|
||||||
|
for old in `ls -t $STORAGE | tail -n +7`; do
|
||||||
|
TOREMOVE="$STORAGE/$old"
|
||||||
|
echo "Removing '$TOREMOVE'";
|
||||||
|
rm -r $TOREMOVE
|
||||||
|
done
|
||||||
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
4 0 * * * /myscripts/backup 2>&1
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
version: "3"
|
||||||
|
services:
|
||||||
|
backup:
|
||||||
|
image: cronjob
|
||||||
|
build: ./
|
||||||
|
networks:
|
||||||
|
- backup-network
|
||||||
|
restart: "unless-stopped"
|
||||||
|
volumes:
|
||||||
|
- /home/ddninja/fdn2/backups:/backups
|
||||||
|
|
||||||
|
|
||||||
|
networks:
|
||||||
|
backup-network:
|
||||||
|
external: true
|
||||||
|
name:
|
||||||
|
backup-network
|
||||||
@@ -5,8 +5,11 @@ services:
|
|||||||
restart: "on-failure:5"
|
restart: "on-failure:5"
|
||||||
networks:
|
networks:
|
||||||
db-network:
|
db-network:
|
||||||
|
backup-network:
|
||||||
|
aliases:
|
||||||
|
- §PROJECT_BUILDNAME§.§ENVIRONMENT_TYPE§.database
|
||||||
volumes:
|
volumes:
|
||||||
- ./persistence/database/mongodb:/usr/local/mongodb
|
- ./persistence/database/mongodb:/data/db/
|
||||||
logging:
|
logging:
|
||||||
driver: "json-file"
|
driver: "json-file"
|
||||||
options:
|
options:
|
||||||
@@ -63,7 +66,7 @@ services:
|
|||||||
max-size: "150m"
|
max-size: "150m"
|
||||||
memcached:
|
memcached:
|
||||||
image: memcached:1.6.9-alpine
|
image: memcached:1.6.9-alpine
|
||||||
restart: "on-failure:3"
|
restart: "on-failure:5"
|
||||||
networks:
|
networks:
|
||||||
§PROJECT_BUILDNAME§-network:
|
§PROJECT_BUILDNAME§-network:
|
||||||
logging:
|
logging:
|
||||||
@@ -75,6 +78,10 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
db-network:
|
db-network:
|
||||||
§PROJECT_BUILDNAME§-network:
|
§PROJECT_BUILDNAME§-network:
|
||||||
|
backup-network:
|
||||||
|
external: true
|
||||||
|
name:
|
||||||
|
backup-network
|
||||||
nginx-network:
|
nginx-network:
|
||||||
external: true
|
external: true
|
||||||
name:
|
name:
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ services:
|
|||||||
restart: "no"
|
restart: "no"
|
||||||
networks:
|
networks:
|
||||||
db-network:
|
db-network:
|
||||||
|
backup-network:
|
||||||
aliases:
|
aliases:
|
||||||
- §PROJECT_BUILDNAME§.§ENVIRONMENT_TYPE§.database
|
- §PROJECT_BUILDNAME§.local.database
|
||||||
volumes:
|
volumes:
|
||||||
- §PROJECT_BUILDNAME§-db-persist:/usr/local/mongodb
|
- §PROJECT_BUILDNAME§-db-persist:/data/db/
|
||||||
webserver:
|
webserver:
|
||||||
image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§-webserver-debug
|
image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§-webserver-debug
|
||||||
env_file:
|
env_file:
|
||||||
@@ -53,6 +54,10 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
db-network:
|
db-network:
|
||||||
§PROJECT_BUILDNAME§-network:
|
§PROJECT_BUILDNAME§-network:
|
||||||
|
backup-network:
|
||||||
|
external: true
|
||||||
|
name:
|
||||||
|
backup-network
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=production
|
|||||||
DDNINJA_IS_PRODUCTION=true
|
DDNINJA_IS_PRODUCTION=true
|
||||||
|
|
||||||
DDNINJA_MONGO_DBNAME=fdn2
|
DDNINJA_MONGO_DBNAME=fdn2
|
||||||
DDNINJA_MONGO_LOCATION=database
|
DDNINJA_MONGO_LOCATION=mongo
|
||||||
|
|
||||||
DDNINJA_PUBLIC_URL=http://preproduction.ifattidinapoli.it
|
DDNINJA_PUBLIC_URL=https://www.ifattidinapoli.it
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=production
|
|||||||
DDNINJA_IS_PRODUCTION=true
|
DDNINJA_IS_PRODUCTION=true
|
||||||
|
|
||||||
DDNINJA_MONGO_DBNAME=fdn2
|
DDNINJA_MONGO_DBNAME=fdn2
|
||||||
DDNINJA_MONGO_LOCATION=database
|
DDNINJA_MONGO_LOCATION=mongo
|
||||||
|
|
||||||
DDNINJA_PUBLIC_URL=http://preproduction.ifattidinapoli.it
|
DDNINJA_PUBLIC_URL=https://www.ifattidinapoli.it
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=test
|
|||||||
DDNINJA_IS_PRODUCTION=false
|
DDNINJA_IS_PRODUCTION=false
|
||||||
|
|
||||||
DDNINJA_MONGO_DBNAME=fdn2_test
|
DDNINJA_MONGO_DBNAME=fdn2_test
|
||||||
DDNINJA_MONGO_LOCATION=database
|
DDNINJA_MONGO_LOCATION=mongo
|
||||||
|
|
||||||
DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
|
DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ DDNINJA_ENVIRONMENT_NAME=test
|
|||||||
DDNINJA_IS_PRODUCTION=false
|
DDNINJA_IS_PRODUCTION=false
|
||||||
|
|
||||||
DDNINJA_MONGO_DBNAME=fdn2_test
|
DDNINJA_MONGO_DBNAME=fdn2_test
|
||||||
DDNINJA_MONGO_LOCATION=database
|
DDNINJA_MONGO_LOCATION=mongo
|
||||||
|
|
||||||
DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
|
DDNINJA_PUBLIC_URL=http://test.ifattidinapoli.it
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||||
|
- ./ssl:/etc/ssl:ro
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
+11
-1
@@ -5,10 +5,20 @@ events { worker_connections 1024; }
|
|||||||
http {
|
http {
|
||||||
client_max_body_size 5M;
|
client_max_body_size 5M;
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
|
||||||
listen 80;
|
listen 80;
|
||||||
|
server_name www.ifattidinapoli.it preproduction.ifattidinapoli.it;
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
server_name www.ifattidinapoli.it preproduction.ifattidinapoli.it default_server;
|
server_name www.ifattidinapoli.it preproduction.ifattidinapoli.it default_server;
|
||||||
|
|
||||||
|
ssl_certificate /etc/ssl/2023/www_ifattidinapoli_it.chained.crt;
|
||||||
|
ssl_certificate_key /etc/ssl/2023/fdn.key;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://fdn2.production.webserver/;
|
proxy_pass http://fdn2.production.webserver/;
|
||||||
proxy_redirect off;
|
proxy_redirect off;
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
-----BEGIN CERTIFICATE REQUEST-----
|
||||||
|
MIICnzCCAYcCAQAwWjELMAkGA1UEBhMCSVQxDzANBgNVBAgMBk5hcGxlczEaMBgG
|
||||||
|
A1UECgwRSSBGYXR0aSBkaSBOYXBvbGkxHjAcBgNVBAMMFXd3dy5pZmF0dGlkaW5h
|
||||||
|
cG9saS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJbB2nqLRej
|
||||||
|
fzPoY2QOaW4cOq3QT2Jgv3hE3m8D81P0eFmy3t3iW9mlpmdY/Exe0wMzl7+gc8/z
|
||||||
|
JoXN70AsiMyGDjMYIvt6AodgP6HhWiH2KLVW2HvhQExh8M1L9HQlKkb0ief0pZ2c
|
||||||
|
e0GhmpLi08scGYzVoZO3u5lkHuiXNiYfTjwHxl2CaZCGX7zLLAphr+BtgZeDhRUY
|
||||||
|
MpsZdZCkKNYQWY5rE0tpI22pL9HEN8Vk2QvhlzWd+YE+dME/G9LgqOxi9BtysfF/
|
||||||
|
JKHwWp2J5OWLMBptcVeC3jCnf41pfvGihh5yLfJfTK33nLYJTWKXdZxT/OqCMM29
|
||||||
|
RqHk1Y96g3kCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4IBAQBZUlT7XLVBiMxwD/JZ
|
||||||
|
FFYMzKHNmZFfrHdQgxlnbRTIjM4Fo5zQ8hF8EgeIN13dguEd52akdfF7NNbfMjEO
|
||||||
|
BK9Efk2Te+Pvue/C7fDN7oIpU86IDbCa6J324er/d2lC3PFO6Cj63ypsFSNfDYbG
|
||||||
|
zHZlohleyaqmSlFufwJaLvUyWCAIZLhDSGTvyThIWNmUAO/G4CxzR1KuOnA+vgd1
|
||||||
|
zf0rilk98wKvtbN9gbSNagcXZWXjLdwnAzoNbn7zG3fl0aiTSC8TUpyFwSXFIgMC
|
||||||
|
XEgEmaCqwpazW9JFUoDkxB8E/CIk1bjSuKioCabI/QHNam+5ckrRnXRf4dBtD56u
|
||||||
|
FUOJ
|
||||||
|
-----END CERTIFICATE REQUEST-----
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
-----BEGIN PRIVATE KEY-----
|
||||||
|
MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCyWwdp6i0Xo38z
|
||||||
|
6GNkDmluHDqt0E9iYL94RN5vA/NT9HhZst7d4lvZpaZnWPxMXtMDM5e/oHPP8yaF
|
||||||
|
ze9ALIjMhg4zGCL7egKHYD+h4Voh9ii1Vth74UBMYfDNS/R0JSpG9Inn9KWdnHtB
|
||||||
|
oZqS4tPLHBmM1aGTt7uZZB7olzYmH048B8ZdgmmQhl+8yywKYa/gbYGXg4UVGDKb
|
||||||
|
GXWQpCjWEFmOaxNLaSNtqS/RxDfFZNkL4Zc1nfmBPnTBPxvS4KjsYvQbcrHxfySh
|
||||||
|
8FqdieTlizAabXFXgt4wp3+NaX7xooYeci3yX0yt95y2CU1il3WcU/zqgjDNvUah
|
||||||
|
5NWPeoN5AgMBAAECggEAYWdDOj2QmLtKib+dIBSa0W6LQUdlQzXQ+06pJ3nB1pTJ
|
||||||
|
cTs1aXnobYmAwiofx1l15ea0Ngvbk7KX1DUuNx7bKs7/TDofSLVOUj5nIfIfNjLn
|
||||||
|
8njWS3ktk0ldp9CWVSPC3fNIqSu7ksLVsXcfIp7Lyb2z2m0FC9YoltHN63pBMTm3
|
||||||
|
NvDN4qdCfH1Vx2/bAKYLdk35RSLhFmcd533BEbVsPxXnia05Y1fBaK6R+/Wh+ccb
|
||||||
|
AhJAAB4MjtWxDyKdK0VDzfXgu/r+zVMMQP4vnL2+NLy/A3LOCulNy/VFs4Y5akw3
|
||||||
|
y3sXR1RFaiFdBUO82mlZWZzqv5Nfoar59IpsSXNbnQKBgQDp9Jv5VcJdO4geDbm8
|
||||||
|
Gdnmrp/OtceiBSXD7QsEgegSQ0DGKiN6lEyb24FBHDu7FR/ZkZdFJCsM8F5TJtqm
|
||||||
|
nKBOMepva7mMMg8hFVC6bDZYXZekgYQo3HrEI4xTKRYtTlTG0Plh59vwqjbiTdRH
|
||||||
|
K1rycfGldRuiu4EKeXuYXsUMYwKBgQDDKUIfrPtxUmXnTDFT5ctBhVYGHcApoqVn
|
||||||
|
RcfTqRXIVZVMe8VIPnsweFtIm1fK2YD+7PlNWhkPiTaX1Iux7nUPyA5PnWhChUQo
|
||||||
|
K6bwRix7TAM5xQ8CgFChr0yAG5kWDX6OY01yVjvxM5Ozg7txY8noSjCkfSy1yh45
|
||||||
|
qGtLBj0xcwKBgDxOFgpeJbychMiiZxbqXvWMW5sP1kaYJxTqvCVMSwKyHTc3U2/c
|
||||||
|
XCbsnNOosGjX2B7f3WswGHy8VMQARuodg2DEkxZnYSuXF7lCYk27aQK8FUONMwDJ
|
||||||
|
XEfElf41oAbLoySgZzfqaRIO/hi1URuLPGU0I8KvfhEjXe7SQ56SBx7bAoGAJd0c
|
||||||
|
Wh7qjbrp0G1E6L0dqTGgVgFxpeJLavTr5xHYCw0nsTYWOYT9y5KeS0DwUIfQciUx
|
||||||
|
3SMM16nMcLqo+7WC+rPaqvGkJ7vJVG3brqQ+vxEpUwz7c4XHnwbutbAlDFVD54Y2
|
||||||
|
oWc/q/VQw7RcKoyswKecNl2ezgpPwOn/Hwgv2ScCgYEAykI57UdyhY8ZQM6WerOK
|
||||||
|
YM+hZW3+3EOY6dkELT9hjR1jG5ShYpgAM0rnj53/Aj0W2aGC7B6SP6oKjTZj3zwq
|
||||||
|
OWR/N/4CrJb/tD+Wrdywz17ApPMamyv8QHi4igYzQrLk6Gesx16X/2HVdgZGAMYk
|
||||||
|
j1e8LTX2iuu1251sl4x0vtU=
|
||||||
|
-----END PRIVATE KEY-----
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB
|
||||||
|
iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
|
||||||
|
cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
|
||||||
|
BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx
|
||||||
|
MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBjzELMAkGA1UEBhMCR0IxGzAZBgNV
|
||||||
|
BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE
|
||||||
|
ChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5TZWN0aWdvIFJTQSBEb21haW4g
|
||||||
|
VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
|
||||||
|
AQ8AMIIBCgKCAQEA1nMz1tc8INAA0hdFuNY+B6I/x0HuMjDJsGz99J/LEpgPLT+N
|
||||||
|
TQEMgg8Xf2Iu6bhIefsWg06t1zIlk7cHv7lQP6lMw0Aq6Tn/2YHKHxYyQdqAJrkj
|
||||||
|
eocgHuP/IJo8lURvh3UGkEC0MpMWCRAIIz7S3YcPb11RFGoKacVPAXJpz9OTTG0E
|
||||||
|
oKMbgn6xmrntxZ7FN3ifmgg0+1YuWMQJDgZkW7w33PGfKGioVrCSo1yfu4iYCBsk
|
||||||
|
Haswha6vsC6eep3BwEIc4gLw6uBK0u+QDrTBQBbwb4VCSmT3pDCg/r8uoydajotY
|
||||||
|
uK3DGReEY+1vVv2Dy2A0xHS+5p3b4eTlygxfFQIDAQABo4IBbjCCAWowHwYDVR0j
|
||||||
|
BBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFI2MXsRUrYrhd+mb
|
||||||
|
+ZsF4bgBjWHhMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
|
||||||
|
A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYGBFUdIAAw
|
||||||
|
CAYGZ4EMAQIBMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0
|
||||||
|
LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2Bggr
|
||||||
|
BgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNv
|
||||||
|
bS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
|
||||||
|
L29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAMr9hvQ5Iw0/H
|
||||||
|
ukdN+Jx4GQHcEx2Ab/zDcLRSmjEzmldS+zGea6TvVKqJjUAXaPgREHzSyrHxVYbH
|
||||||
|
7rM2kYb2OVG/Rr8PoLq0935JxCo2F57kaDl6r5ROVm+yezu/Coa9zcV3HAO4OLGi
|
||||||
|
H19+24rcRki2aArPsrW04jTkZ6k4Zgle0rj8nSg6F0AnwnJOKf0hPHzPE/uWLMUx
|
||||||
|
RP0T7dWbqWlod3zu4f+k+TY4CFM5ooQ0nBnzvg6s1SQ36yOoeNDT5++SR2RiOSLv
|
||||||
|
xvcRviKFxmZEJCaOEDKNyJOuB56DPi/Z+fVGjmO+wea03KbNIaiGCpXZLoUmGv38
|
||||||
|
sbZXQm2V0TP2ORQGgkE49Y9Y3IBbpNV9lXj9p5v//cWoaasm56ekBYdbqbe4oyAL
|
||||||
|
l6lFhd2zi+WJN44pDfwGF/Y4QA5C5BIG+3vzxhFoYt/jmPQT2BVPi7Fp2RBgvGQq
|
||||||
|
6jG35LWjOhSbJuMLe/0CjraZwTiXWTb2qHSihrZe68Zk6s+go/lunrotEbaGmAhY
|
||||||
|
LcmsJWTyXnW0OMGuf1pGg+pRyrbxmRE1a6Vqe8YAsOf4vmSyrcjC8azjUeqkk+B5
|
||||||
|
yOGBQMkKW+ESPMFgKuOXwIlCypTPRpgSabuY0MLTDXJLR27lk8QyKGOHQ+SwMj4K
|
||||||
|
00u/I5sUKUErmgQfky3xxzlIPK1aEn8=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7
|
||||||
|
MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
|
||||||
|
VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
|
||||||
|
AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4
|
||||||
|
MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5
|
||||||
|
MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO
|
||||||
|
ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0
|
||||||
|
aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI
|
||||||
|
s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG
|
||||||
|
vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ
|
||||||
|
Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb
|
||||||
|
IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0
|
||||||
|
tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E
|
||||||
|
xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV
|
||||||
|
icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5
|
||||||
|
D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ
|
||||||
|
WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ
|
||||||
|
5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG
|
||||||
|
KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg
|
||||||
|
EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID
|
||||||
|
ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG
|
||||||
|
BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
|
||||||
|
L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
|
||||||
|
BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA
|
||||||
|
A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+
|
||||||
|
rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+
|
||||||
|
/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA
|
||||||
|
CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F
|
||||||
|
zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA
|
||||||
|
vGp4z7h/jnZymQyd/teRCBaho1+V
|
||||||
|
-----END CERTIFICATE-----
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIGRjCCBS6gAwIBAgIQG6xJJKZ9lKNxKxeUUr9jkjANBgkqhkiG9w0BAQsFADCB
|
||||||
|
jzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
|
||||||
|
A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQD
|
||||||
|
Ey5TZWN0aWdvIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB
|
||||||
|
MB4XDTIzMDcxNjAwMDAwMFoXDTI0MDcxNTIzNTk1OVowIDEeMBwGA1UEAxMVd3d3
|
||||||
|
LmlmYXR0aWRpbmFwb2xpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
|
||||||
|
AQEAslsHaeotF6N/M+hjZA5pbhw6rdBPYmC/eETebwPzU/R4WbLe3eJb2aWmZ1j8
|
||||||
|
TF7TAzOXv6Bzz/Mmhc3vQCyIzIYOMxgi+3oCh2A/oeFaIfYotVbYe+FATGHwzUv0
|
||||||
|
dCUqRvSJ5/SlnZx7QaGakuLTyxwZjNWhk7e7mWQe6Jc2Jh9OPAfGXYJpkIZfvMss
|
||||||
|
CmGv4G2Bl4OFFRgymxl1kKQo1hBZjmsTS2kjbakv0cQ3xWTZC+GXNZ35gT50wT8b
|
||||||
|
0uCo7GL0G3Kx8X8kofBanYnk5YswGm1xV4LeMKd/jWl+8aKGHnIt8l9MrfectglN
|
||||||
|
Ypd1nFP86oIwzb1GoeTVj3qDeQIDAQABo4IDCjCCAwYwHwYDVR0jBBgwFoAUjYxe
|
||||||
|
xFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFLGF834raf283GA9pFOjRI267ZFa
|
||||||
|
MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
|
||||||
|
BwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIHMCUwIwYIKwYB
|
||||||
|
BQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECATCBhAYIKwYB
|
||||||
|
BQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3RpZ28uY29tL1Nl
|
||||||
|
Y3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsG
|
||||||
|
AQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTAzBgNVHREELDAqghV3d3cu
|
||||||
|
aWZhdHRpZGluYXBvbGkuaXSCEWlmYXR0aWRpbmFwb2xpLml0MIIBfgYKKwYBBAHW
|
||||||
|
eQIEAgSCAW4EggFqAWgAdgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6
|
||||||
|
dAAAAYld4GjHAAAEAwBHMEUCIQDqnPLPzDT6f45fD/xq76S70zCDjLS5WwW1MzNl
|
||||||
|
GvFrJQIgQLF7dF1K2jKZpl5BC3w/CSacLx7s43tJ9DmmS25APz4AdwDatr9rP7W2
|
||||||
|
Ip+bwrtca+hwkXFsu1GEhTS9pD0wSNf7qwAAAYld4GkTAAAEAwBIMEYCIQDbrYll
|
||||||
|
rrh9QXqjtuiaIQtAdr254lWThoC44N4f0grxnAIhAMQZghRkyI/ewSRaa3RDK+C1
|
||||||
|
I1ajIxlSV2S67/y+BounAHUA7s3QZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEf
|
||||||
|
tZsAAAGJXeBo9gAABAMARjBEAiAlWDAaLGjH1sM0xQIY7H2rOFmrfwZEC16rol7i
|
||||||
|
mUSoiAIgbT5EfzeXmMegnpPaZTMG+TcbX4STS+JFSbwX5HcWM+IwDQYJKoZIhvcN
|
||||||
|
AQELBQADggEBAFKU20+ZeL6cdExSU5lHYUH+X4qP01jyLKQCtnKueEJE+5bZSoVz
|
||||||
|
ArLT+ob8UKeDK//fXAdVC7ULf6y9GmEgjVefuCg5bRpdyEXilfsmo3/9Bp9c//KY
|
||||||
|
7eO9l2PZljlXuFSvsGjj29mnX87oBEqUlNpWFPXewBYmQfVEHLvukHaRlrZ8BUbv
|
||||||
|
nTFhdqy6taf6tAYFmJy6TBWsu2OiTBa3lanad/XwtK7nn3F62HLUBKTQd/ZlLexu
|
||||||
|
J3tI3vFR/ph4UaSyv9tz6sCVnGnysFDO9OJZ2TsomPFwXQwzrebodsdOH+eaOtbj
|
||||||
|
SrU3Nn67sz7LQKsqBsvUMm8N/PdhsQLzf00=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIGEzCCA/ugAwIBAgIQfVtRJrR2uhHbdBYLvFMNpzANBgkqhkiG9w0BAQwFADCB
|
||||||
|
iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
|
||||||
|
cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
|
||||||
|
BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTgx
|
||||||
|
MTAyMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjCBjzELMAkGA1UEBhMCR0IxGzAZBgNV
|
||||||
|
BAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEYMBYGA1UE
|
||||||
|
ChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQDEy5TZWN0aWdvIFJTQSBEb21haW4g
|
||||||
|
VmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
|
||||||
|
AQ8AMIIBCgKCAQEA1nMz1tc8INAA0hdFuNY+B6I/x0HuMjDJsGz99J/LEpgPLT+N
|
||||||
|
TQEMgg8Xf2Iu6bhIefsWg06t1zIlk7cHv7lQP6lMw0Aq6Tn/2YHKHxYyQdqAJrkj
|
||||||
|
eocgHuP/IJo8lURvh3UGkEC0MpMWCRAIIz7S3YcPb11RFGoKacVPAXJpz9OTTG0E
|
||||||
|
oKMbgn6xmrntxZ7FN3ifmgg0+1YuWMQJDgZkW7w33PGfKGioVrCSo1yfu4iYCBsk
|
||||||
|
Haswha6vsC6eep3BwEIc4gLw6uBK0u+QDrTBQBbwb4VCSmT3pDCg/r8uoydajotY
|
||||||
|
uK3DGReEY+1vVv2Dy2A0xHS+5p3b4eTlygxfFQIDAQABo4IBbjCCAWowHwYDVR0j
|
||||||
|
BBgwFoAUU3m/WqorSs9UgOHYm8Cd8rIDZsswHQYDVR0OBBYEFI2MXsRUrYrhd+mb
|
||||||
|
+ZsF4bgBjWHhMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0G
|
||||||
|
A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAbBgNVHSAEFDASMAYGBFUdIAAw
|
||||||
|
CAYGZ4EMAQIBMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9jcmwudXNlcnRydXN0
|
||||||
|
LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDB2Bggr
|
||||||
|
BgEFBQcBAQRqMGgwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jcnQudXNlcnRydXN0LmNv
|
||||||
|
bS9VU0VSVHJ1c3RSU0FBZGRUcnVzdENBLmNydDAlBggrBgEFBQcwAYYZaHR0cDov
|
||||||
|
L29jc3AudXNlcnRydXN0LmNvbTANBgkqhkiG9w0BAQwFAAOCAgEAMr9hvQ5Iw0/H
|
||||||
|
ukdN+Jx4GQHcEx2Ab/zDcLRSmjEzmldS+zGea6TvVKqJjUAXaPgREHzSyrHxVYbH
|
||||||
|
7rM2kYb2OVG/Rr8PoLq0935JxCo2F57kaDl6r5ROVm+yezu/Coa9zcV3HAO4OLGi
|
||||||
|
H19+24rcRki2aArPsrW04jTkZ6k4Zgle0rj8nSg6F0AnwnJOKf0hPHzPE/uWLMUx
|
||||||
|
RP0T7dWbqWlod3zu4f+k+TY4CFM5ooQ0nBnzvg6s1SQ36yOoeNDT5++SR2RiOSLv
|
||||||
|
xvcRviKFxmZEJCaOEDKNyJOuB56DPi/Z+fVGjmO+wea03KbNIaiGCpXZLoUmGv38
|
||||||
|
sbZXQm2V0TP2ORQGgkE49Y9Y3IBbpNV9lXj9p5v//cWoaasm56ekBYdbqbe4oyAL
|
||||||
|
l6lFhd2zi+WJN44pDfwGF/Y4QA5C5BIG+3vzxhFoYt/jmPQT2BVPi7Fp2RBgvGQq
|
||||||
|
6jG35LWjOhSbJuMLe/0CjraZwTiXWTb2qHSihrZe68Zk6s+go/lunrotEbaGmAhY
|
||||||
|
LcmsJWTyXnW0OMGuf1pGg+pRyrbxmRE1a6Vqe8YAsOf4vmSyrcjC8azjUeqkk+B5
|
||||||
|
yOGBQMkKW+ESPMFgKuOXwIlCypTPRpgSabuY0MLTDXJLR27lk8QyKGOHQ+SwMj4K
|
||||||
|
00u/I5sUKUErmgQfky3xxzlIPK1aEn8=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIFgTCCBGmgAwIBAgIQOXJEOvkit1HX02wQ3TE1lTANBgkqhkiG9w0BAQwFADB7
|
||||||
|
MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
|
||||||
|
VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE
|
||||||
|
AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4
|
||||||
|
MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5
|
||||||
|
MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO
|
||||||
|
ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0
|
||||||
|
aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAgBJlFzYOw9sI
|
||||||
|
s9CsVw127c0n00ytUINh4qogTQktZAnczomfzD2p7PbPwdzx07HWezcoEStH2jnG
|
||||||
|
vDoZtF+mvX2do2NCtnbyqTsrkfjib9DsFiCQCT7i6HTJGLSR1GJk23+jBvGIGGqQ
|
||||||
|
Ijy8/hPwhxR79uQfjtTkUcYRZ0YIUcuGFFQ/vDP+fmyc/xadGL1RjjWmp2bIcmfb
|
||||||
|
IWax1Jt4A8BQOujM8Ny8nkz+rwWWNR9XWrf/zvk9tyy29lTdyOcSOk2uTIq3XJq0
|
||||||
|
tyA9yn8iNK5+O2hmAUTnAU5GU5szYPeUvlM3kHND8zLDU+/bqv50TmnHa4xgk97E
|
||||||
|
xwzf4TKuzJM7UXiVZ4vuPVb+DNBpDxsP8yUmazNt925H+nND5X4OpWaxKXwyhGNV
|
||||||
|
icQNwZNUMBkTrNN9N6frXTpsNVzbQdcS2qlJC9/YgIoJk2KOtWbPJYjNhLixP6Q5
|
||||||
|
D9kCnusSTJV882sFqV4Wg8y4Z+LoE53MW4LTTLPtW//e5XOsIzstAL81VXQJSdhJ
|
||||||
|
WBp/kjbmUZIO8yZ9HE0XvMnsQybQv0FfQKlERPSZ51eHnlAfV1SoPv10Yy+xUGUJ
|
||||||
|
5lhCLkMaTLTwJUdZ+gQek9QmRkpQgbLevni3/GcV4clXhB4PY9bpYrrWX1Uu6lzG
|
||||||
|
KAgEJTm4Diup8kyXHAc/DVL17e8vgg8CAwEAAaOB8jCB7zAfBgNVHSMEGDAWgBSg
|
||||||
|
EQojPpbxB+zirynvgqV/0DCktDAdBgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rID
|
||||||
|
ZsswDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wEQYDVR0gBAowCDAG
|
||||||
|
BgRVHSAAMEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29t
|
||||||
|
L0FBQUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDQGCCsGAQUFBwEBBCgwJjAkBggr
|
||||||
|
BgEFBQcwAYYYaHR0cDovL29jc3AuY29tb2RvY2EuY29tMA0GCSqGSIb3DQEBDAUA
|
||||||
|
A4IBAQAYh1HcdCE9nIrgJ7cz0C7M7PDmy14R3iJvm3WOnnL+5Nb+qh+cli3vA0p+
|
||||||
|
rvSNb3I8QzvAP+u431yqqcau8vzY7qN7Q/aGNnwU4M309z/+3ri0ivCRlv79Q2R+
|
||||||
|
/czSAaF9ffgZGclCKxO/WIu6pKJmBHaIkU4MiRTOok3JMrO66BQavHHxW/BBC5gA
|
||||||
|
CiIDEOUMsfnNkjcZ7Tvx5Dq2+UUTJnWvu6rvP3t3O9LEApE9GQDTF1w52z97GA1F
|
||||||
|
zZOFli9d31kWTz9RvdVFGD/tSo7oBmF0Ixa1DVBzJ0RHfxBdiSprhTEUxOipakyA
|
||||||
|
vGp4z7h/jnZymQyd/teRCBaho1+V
|
||||||
|
-----END CERTIFICATE-----
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
-----BEGIN CERTIFICATE-----
|
||||||
|
MIIGRjCCBS6gAwIBAgIQG6xJJKZ9lKNxKxeUUr9jkjANBgkqhkiG9w0BAQsFADCB
|
||||||
|
jzELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
|
||||||
|
A1UEBxMHU2FsZm9yZDEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTcwNQYDVQQD
|
||||||
|
Ey5TZWN0aWdvIFJTQSBEb21haW4gVmFsaWRhdGlvbiBTZWN1cmUgU2VydmVyIENB
|
||||||
|
MB4XDTIzMDcxNjAwMDAwMFoXDTI0MDcxNTIzNTk1OVowIDEeMBwGA1UEAxMVd3d3
|
||||||
|
LmlmYXR0aWRpbmFwb2xpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
|
||||||
|
AQEAslsHaeotF6N/M+hjZA5pbhw6rdBPYmC/eETebwPzU/R4WbLe3eJb2aWmZ1j8
|
||||||
|
TF7TAzOXv6Bzz/Mmhc3vQCyIzIYOMxgi+3oCh2A/oeFaIfYotVbYe+FATGHwzUv0
|
||||||
|
dCUqRvSJ5/SlnZx7QaGakuLTyxwZjNWhk7e7mWQe6Jc2Jh9OPAfGXYJpkIZfvMss
|
||||||
|
CmGv4G2Bl4OFFRgymxl1kKQo1hBZjmsTS2kjbakv0cQ3xWTZC+GXNZ35gT50wT8b
|
||||||
|
0uCo7GL0G3Kx8X8kofBanYnk5YswGm1xV4LeMKd/jWl+8aKGHnIt8l9MrfectglN
|
||||||
|
Ypd1nFP86oIwzb1GoeTVj3qDeQIDAQABo4IDCjCCAwYwHwYDVR0jBBgwFoAUjYxe
|
||||||
|
xFStiuF36Zv5mwXhuAGNYeEwHQYDVR0OBBYEFLGF834raf283GA9pFOjRI267ZFa
|
||||||
|
MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
|
||||||
|
BwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgIHMCUwIwYIKwYB
|
||||||
|
BQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECATCBhAYIKwYB
|
||||||
|
BQUHAQEEeDB2ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LnNlY3RpZ28uY29tL1Nl
|
||||||
|
Y3RpZ29SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0MCMGCCsG
|
||||||
|
AQUFBzABhhdodHRwOi8vb2NzcC5zZWN0aWdvLmNvbTAzBgNVHREELDAqghV3d3cu
|
||||||
|
aWZhdHRpZGluYXBvbGkuaXSCEWlmYXR0aWRpbmFwb2xpLml0MIIBfgYKKwYBBAHW
|
||||||
|
eQIEAgSCAW4EggFqAWgAdgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6
|
||||||
|
dAAAAYld4GjHAAAEAwBHMEUCIQDqnPLPzDT6f45fD/xq76S70zCDjLS5WwW1MzNl
|
||||||
|
GvFrJQIgQLF7dF1K2jKZpl5BC3w/CSacLx7s43tJ9DmmS25APz4AdwDatr9rP7W2
|
||||||
|
Ip+bwrtca+hwkXFsu1GEhTS9pD0wSNf7qwAAAYld4GkTAAAEAwBIMEYCIQDbrYll
|
||||||
|
rrh9QXqjtuiaIQtAdr254lWThoC44N4f0grxnAIhAMQZghRkyI/ewSRaa3RDK+C1
|
||||||
|
I1ajIxlSV2S67/y+BounAHUA7s3QZNXbGs7FXLedtM0TojKHRny87N7DUUhZRnEf
|
||||||
|
tZsAAAGJXeBo9gAABAMARjBEAiAlWDAaLGjH1sM0xQIY7H2rOFmrfwZEC16rol7i
|
||||||
|
mUSoiAIgbT5EfzeXmMegnpPaZTMG+TcbX4STS+JFSbwX5HcWM+IwDQYJKoZIhvcN
|
||||||
|
AQELBQADggEBAFKU20+ZeL6cdExSU5lHYUH+X4qP01jyLKQCtnKueEJE+5bZSoVz
|
||||||
|
ArLT+ob8UKeDK//fXAdVC7ULf6y9GmEgjVefuCg5bRpdyEXilfsmo3/9Bp9c//KY
|
||||||
|
7eO9l2PZljlXuFSvsGjj29mnX87oBEqUlNpWFPXewBYmQfVEHLvukHaRlrZ8BUbv
|
||||||
|
nTFhdqy6taf6tAYFmJy6TBWsu2OiTBa3lanad/XwtK7nn3F62HLUBKTQd/ZlLexu
|
||||||
|
J3tI3vFR/ph4UaSyv9tz6sCVnGnysFDO9OJZ2TsomPFwXQwzrebodsdOH+eaOtbj
|
||||||
|
SrU3Nn67sz7LQKsqBsvUMm8N/PdhsQLzf00=
|
||||||
|
-----END CERTIFICATE-----
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
###############
|
###############
|
||||||
RewriteEngine On
|
RewriteEngine On
|
||||||
RewriteRule ^(.*)$ http://www.ifattidinapoli.com/fdn2/$1 [P,L]
|
RewriteRule ^(.*)$ https://www.ifattidinapoli.com/fdn2/$1 [P,L]
|
||||||
###############
|
###############
|
||||||
@@ -5,7 +5,7 @@
|
|||||||
IS_V2=`aws --version | grep -P "^aws-cli/2" | wc -l`
|
IS_V2=`aws --version | grep -P "^aws-cli/2" | wc -l`
|
||||||
|
|
||||||
if [[ $IS_V2 -eq "1" ]]; then
|
if [[ $IS_V2 -eq "1" ]]; then
|
||||||
aws ecr get-login-password --region eu-west-1 | docker login --username AWS --password-stdin 299952237278.dkr.ecr.eu-west-1.amazonaws.com
|
aws ecr get-login-password --region eu-west-1 --profile personal | docker login --username AWS --password-stdin 299952237278.dkr.ecr.eu-west-1.amazonaws.com
|
||||||
else
|
else
|
||||||
$(aws ecr get-login --no-include-email)
|
$(aws ecr get-login --no-include-email --profile personal)
|
||||||
fi
|
fi
|
||||||
|
|||||||
+1
-1
@@ -157,7 +157,7 @@ if [[ $PUBLISH_MODE -eq 1 ]]; then
|
|||||||
|
|
||||||
# WORKER
|
# WORKER
|
||||||
msg "running ./build.sh -I worker -$BUILDOPT -t $TAG-worker"
|
msg "running ./build.sh -I worker -$BUILDOPT -t $TAG-worker"
|
||||||
./build.sh -I webserver -$BUILDOPT -t "$TAG-worker"
|
./build.sh -I worker -$BUILDOPT -t "$TAG-worker"
|
||||||
|
|
||||||
./run-unit.sh $VERBOPT -t "$TAG-worker"
|
./run-unit.sh $VERBOPT -t "$TAG-worker"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user