Merge pull request lemcomm#32 from Zanaras/bye-security-context

Bye security context
Zanaras · Sep 17, 2017 · a716e5a · a716e5a
2 parents f7723e5 + 46fa36f
commit a716e5a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -133,6 +133,14 @@ fos_user:
     registration:
         confirmation:
             enabled:    true
+            from_email:
+                address:        mafserver@lemuriacommunity.org
+                sender_name:    Might & Fealty Server
+    resetting:
+        email:
+            from_email:
+                address:        mafserver@lemuriacommunity.org
+                sender_name:    Might & Fealty Server
     from_email:
-        address:        noreply@mightandfealty.com
+        address:        mafserver@lemuriacommunity.org
         sender_name:    Might & Fealty Server
diff --git a/run_dungeons.sh b/run_dungeons.sh
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-LOGDIR="/var/www/maf/app/logs"
+LOGDIR="/var/maf/logs"
 
 
-php ~/symfony/app/console --env=prod dungeons:hourly -d 2>&1 > $LOGDIR/run_dungeons.log
-if [ "$?" -ne "0" ]; then
-#	mail tom@lemuria.org -s 'MaF Dungeons Problem' < $LOGDIR/run_dungeons.log
-fi
-
+php /var/www/maf/app/console --env=prod dungeons:hourly -d 2>&1 > $LOGDIR/run_dungeons.log
diff --git a/src/BM2/SiteBundle/Command/PaymentCommand.php b/src/BM2/SiteBundle/Command/PaymentCommand.php
@@ -85,13 +85,14 @@ protected function execute(InputInterface $input, OutputInterface $output) {
 		$output->writeln("$inactives characters set to inactive");
 		$em->flush();
 
+		/* As M&F now longer uses the spool, this section of code is completely useless, and causes the paymenet processor to hang. --Andrew 20170906
 		// flush the mail queue (account expired messages)
 		$mailer = $this->getContainer()->get('mailer');
 		$spool = $mailer->getTransport()->getSpool();
 		$transport = $this->getContainer()->get('swiftmailer.transport.real');
 		if ($spool && $transport) {
 			$spool->flushQueue($transport);
-		}
+		} */
 
 
 		$pm = $this->getContainer()->get('payment_manager');

diff --git a/src/BM2/SiteBundle/Form/ListSelectType.php b/src/BM2/SiteBundle/Form/ListSelectType.php
@@ -34,7 +34,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) {
 			'label'=>'character.list.select',
 			'expanded'=>true,
 			'required'=>true,
-			'empty_data'=>1,
 			'choices'=>$groups
 		));
 		$builder->add('submit', 'submit', array('label'=>'character.list.submit'));

diff --git a/turn.sh b/turn.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-BACKUPDIR="/var/www/maf/app/backups"
-LOGDIR="/var/www/maf/app/logs"
+BACKUPDIR="/var/maf/backups"
+LOGDIR="/var/maf/logs"
 APP="/var/www/maf/app/console"
 DAY=`date +%a%H`
 DATE=`date +%y%m%d%H`
@@ -25,9 +25,9 @@ echo "----- turn done -----" >> $LOGDIR/turn-$DAY.log
 php $APP maf:stats:turn --env=prod -d 2>&1 > $LOGDIR/stats.log
 
 # map generation and legacy map storage
- cp /var/www/qgis/maps/allrealms.png /var/www/maf/qgis/history/allrealms-$DATE.png
- cp /var/www/qgis/maps/2ndrealms.png /var/www/maf/qgis/history/2ndrealms-$DATE.png
- cp /var/www/qgis/maps/majorrealms.png /var/www/maf/wgis/history/majorrealms-$DATE.png
+ cp /var/www/qgis/maps/allrealms.png /var/www/qgis/maps/history/allrealms-$DATE.png
+ cp /var/www/qgis/maps/2ndrealms.png /var/www/qgis/maps/history/2ndrealms-$DATE.png
+ cp /var/www/qgis/maps/majorrealms.png /var/www/qgis/maps/history/majorrealms-$DATE.png
  curl -so /var/www/qgis/maps/allrealms.png "http://maps.mightandfealty.com/qgis?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=0,0,512000,512000&CRS=EPSG:4326&WIDTH=2048&HEIGHT=2048&LAYERS=water,blocked,AllRealms&FORMAT=image/png&map=MapWithRealms.qgs"
  curl -so /var/www/qgis/maps/2ndrealms.png "http://maps.mightandfealty.com/qgis?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=0,0,512000,512000&CRS=EPSG:4326&WIDTH=2048&HEIGHT=2048&LAYERS=water,blocked,2ndLevelRealms&FORMAT=image/png&map=MapWithRealms.qgs"
  curl -so /var/www/qgis/maps/majorrealms.png "http://maps.mightandfealty.com/qgis?SERVICE=WMS&VERSION=1.3.0&REQUEST=GetMap&BBOX=0,0,512000,512000&CRS=EPSG:4326&WIDTH=2048&HEIGHT=2048&LAYERS=water,blocked,MajorRealms&FORMAT=image/png&map=MapWithRealms.qgs"