Setting for Dev and Phase 2

Author: devinmatte

.htaccess

@@ -22,7 +22,7 @@ RewriteRule ^schedule/[^/]*/ical$ api/schedule.php [L]
 
 # Redirect all images to assets
 # TODO Get it to redirect properly
-RewriteRule /([^.]+\.png)$ https://assets.csh.rit.edu/schedulemaker/$1 [R=301,L,NC]
+# RewriteRule /([^.]+\.png)$ https://assets.csh.rit.edu/schedulemaker/$1 [R=301,L,NC]
 
 # Don't rewrite files or directories
 RewriteCond %{REQUEST_FILENAME} -f [OR]

inc/config.env.php

@@ -23,9 +23,10 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // S3 CONFIG
-$S3_SERVER = $get_env(getenv("S3_SERVER"), 's3.csh.rit.edu');
+$S3_SERVER = $get_env(getenv("S3_SERVER"), 'https://s3.csh.rit.edu');
 $S3_KEY = $get_env(getenv("S3_KEY"), '');
 $S3_SECRET = $get_env(getenv("S3_SECRET"), '');
+$S3_IMAGE_BUCKET = $get_env(getenv("S3_IMAGE_BUCKET"), 'schedulemaker');
 
 ////////////////////////////////////////////////////////////////////////////
 //// APP VERSIONS

inc/config.example.php

@@ -24,9 +24,10 @@
 
 ////////////////////////////////////////////////////////////////////////////
 // S3 CONFIG
-$S3_SERVER = 's3.csh.rit.edu';
+$S3_SERVER = 'https://s3.csh.rit.edu';
 $S3_KEY = '';
 $S3_SECRET = '';
+$S3_IMAGE_BUCKET = 'schedulemaker';
 
 ////////////////////////////////////////////////////////////////////////////
 // CALCULATIONS