added in config for aws & transcoding

minds/templates/configMap.yaml

@@ -592,69 +592,69 @@ data:
  'cassandra-notifications' => true,
  ]);
 
+  
  $CONFIG->set('aws', [
  'key' => '{{ .Values.aws.key }}',
  'secret' => '{{ .Values.aws.secret }}',
- 'useRoles' => false,
- 'bucket' => 'cinemr',
- 'staticStorage' => 'cinemr_dev',
- 'region' => 'us-east-1',
- 'account_id' => '324044571751',
+ 'useRoles' =>  '{{ .Values.aws.useRoles }}',
+ 'bucket' => '{{ .Values.aws.bucket }}',
+ 'staticStorage' => '{{ .Values.aws.staticStorage }}',
+ 'region' => '{{ .Values.aws.region }}',
+ 'account_id' => '{{ .Values.aws.account_id }}',
  'elastic_transcoder' => [
- 'pipeline_id' => '1401290942976-efm3xj',
+ 'pipeline_id' => '{{ .Values.aws.pipeline_id }}',
  'presets' => [
- "360.mp4" => "1351620000001-000040",
- "720.mp4" => "1351620000001-000010",
- "360.webm" => "1404848610623-0blc5v",
- "720.webm" => "1404852762051-zzvwfq"
+ '360.mp4' => '{{ .Values.aws.mp4_360 }}',
+ '720.mp4' => '{{ .Values.aws.mp4_720 }}',
+ '360.webm' => '{{ .Values.aws.webm_360 }}',
+ '720.webm' => '{{ .Values.aws.webm_720 }}',
  ],
- 'dir' => 'cinemr_dev'
+ 'dir' => '{{ .Values.aws.dir}}'
  ],
  'queue' => [
- 'namespace' => 'EmiDev',
- 'wait_seconds' => 3,
+ 'namespace' => '{{ .Values.aws.namespace }}',
+ 'wait_seconds' => '{{ .Values.aws.wait_seconds }}',
  ]
  ]);
 
  $CONFIG->set('transcode', [
- //'free_threshold' => 900, // 15 minutes
- 'free_threshold' => 2,
- 'hd_price' => 1, // tokens
- 'fhd_price' => 1.5, // tokens
+ 'free_threshold' => '{{ .Values.transcode.free_threshold }}',
+ 'hd_price' => '{{ .Values.transcode.hd_price }}', 
+ 'fhd_price' => '{{ .Values.transcode.fhd_price }}',
  ]);
 
  $CONFIG->set('transcoder', [
- 'threads' => 4,
- 'dir' => 'cinemr_dev',
- 'presets' => [
- [
- 'width' => 640,
- 'height' => 360,
- 'bitrate' => 500,
- 'audio_bitrate' => 80,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => false,
- ],
- [
- 'width' => 1280,
- 'height' => 720,
- 'bitrate' => 2000,
- 'audio_bitrate' => 128,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => false,
- ],
- [
- 'width' => 1920,
- 'height' => 1080,
- 'bitrate' => 2000,
- 'audio_bitrate' => 128,
- 'formats' => [ 'mp4', 'webm' ],
- 'charge' => true,
- ],
- ]
- ]);
+  'threads' => '{{ .Values.transcoder.threads }}',
+  'dir' => '{{ .Values.transcoder.dir }}',
+  'presets' => [
+  [
+  'width' => '{{ .Values.transcoder.width }}',
+  'height' => '{{ .Values.transcoder.height }}',
+  'bitrate' => '{{ .Values.transcoder.bitrate }}',
+  'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate }}',
+  'formats' => '{{ .Values.transcoder.formats }}'
+  'charge' => '{{ .Values.transcoder.charge }}'
+  ],
+  [
+  'width' => '{{ .Values.transcoder.width2 }}'
+  'height' => '{{ .Values.transcoder.height2 }}'
+  'bitrate' => '{{ .Values.transcoder.bitrate2 }}'
+  'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate2 }}'
+  'formats' => '{{ .Values.transcoder.formats2 }}'
+  'charge' => '{{ .Values.transcoder.charge2 }}'
+  ],
+  [
+  'width' => '{{ .Values.transcoder.width3 }}'
+  'height' => '{{ .Values.transcoder.height3 }}'
+  'bitrate' => '{{ .Values.transcoder.bitrate3 }}'
+  'audio_bitrate' => '{{ .Values.transcoder.audio_bitrate3 }}'
+  'formats' => '{{ .Values.transcoder.formats3 }}'
+  'charge' => '{{ .Values.transcoder.charge3 }}'
+  ],
+  ]
+  ]);
 
- $CONFIG->cinemr_url = 'https://cinemr.s3.amazonaws.com/cinemr_dev/';
+  $CONFIG->cinemr_url = 'https://cinemr.s3.amazonaws.com/cinemr_dev/';
 
  php-fpm.conf: |-
  [www]

minds/values.yaml

@@ -205,8 +205,54 @@ encryptionKeys:
 
 aws:
  snsSecret:
- key:
+ key: 
  secret:
+ useRoles: false
+ bucket: 'cinemr'
+ staticStorage: 'cinemr_dev'
+ region: 'us-east-1'
+ account_id: '324044571751'
+ pipeline_id: '1401290942976-efm3xj'
+ mp4_360: '1351620000001-000040'
+ mp4_720: '1351620000001-000040'
+ webm_360: '1404848610623-0blc5v'
+ webm_720: '1404852762051-zzvwfq'
+ dir: 'cinemr_dev'
+ namespace: 'EmiDev' 
+ wait_seconds: 3
+
+
+transcode:
+ free_threshold: '2'
+ hd_price: '1'
+ fhd_price: '1.5'
+
+transcoder:
+ threads: 4
+ dir: 'cinemr_dev'
+ presets:
+ width: 640
+ height: 360
+ bitrate: 500
+ audio_bitrate: 80
+ formats: |
+ ['mp4', 'webm']
+ charge: false
+ width2: 640
+ height2: 360
+ bitrate2: 500
+ audio_bitrate2: 80
+ formats2: |
+ ['mp4', 'webm']
+ charge2: false
+ width3: 640
+ height3: 360
+ bitrate3: 500
+ audio_bitrate3: 80
+ formats3: |
+ ['mp4', 'webm']
+ charge3: false
+
 
 blockchain:
  testNet: 'true'