1.7.8 bug fixing (#182)

* Disable image resizing
xibosignage/xibo#778

* New setting for preventing sleep
xibosignage/xibo#794

* Improve recurring schedule error message
xibosignage/xibo#774

* Expire the cache when adding/removing a display from a display group
xibosignage/xibo#783

* Catch and check binlog error in sessions and report said error on Fault page
xibosignage/xibo#787

* Update vagrant file for docker.
Fix installation for non localhost mysql
xibosignage/xibo#770

* Bump versions.

Vagrantfile

@@ -5,15 +5,42 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| 
-  config.vm.box = "avenuefactory/lamp"
-  config.vm.network :public_network, type: "dhcp"
-  config.vm.synced_folder "./", "/var/www/html", id: "vagrant-root",
-   owner: "vagrant",
-   group: "www-data",
-   mount_options: ["dmode=775,fmode=664"]
+    # Increase our guests RAM to 1GB (docker mysql will fail otherwise)
+    config.vm.provider "virtualbox" do |v|
+        v.memory = 1024
+    end
 
-  # Output the IP address for easy access to the VM
-  config.vm.provision "shell",
+    config.vm.box = "ubuntu/trusty64"
+    config.vm.network :public_network, type: "dhcp"
+
+    # Mount the this folder to /data/web - set group permissions to www-data to give
+    # the docker cms-web instance write access
+    # NOTE: cms-db instance mounts /data/db inside the guest only. Data persists over vagrant restarts
+    # but we don't care about persisting externally if we vagrant destroy.
+    config.vm.synced_folder "./", "/data/web", id: "vagrant-web",
+        owner: "vagrant",
+        group: "www-data",
+        mount_options: ["dmode=775,fmode=664"]
+
+    # Provision docker
+    config.vm.provision "docker" do |d|
+        d.pull_images "mysql:5.5"
+        d.pull_images "xibosignage/xibo-cms:latest-1.7"
+        d.run "cms-db",
+          image: "mysql:5.5",
+          args: "-p 3306:3306 -v /data/db:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=root"
+        d.run "cms-web",
+          image: "xibosignage/xibo-cms:latest-1.7",
+          args: "-p 80:80 -e XIBO_DEV_MODE=true -v /data/web:/var/www -v /data/backup:/var/www/backup --link cms-db:mysql"
+    end
+
+    # Run a shell provisioner to restart the docker cms-web container (to map the shared folder correctly)
+    config.vm.provision "shell",
+    inline: "docker restart cms-web",
+    run: "always"
+
+    # Output the IP address for easy access to the VM
+    config.vm.provision "shell",
     inline: "/sbin/ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'",
     run: "always"
 end

config/client.config.php

@@ -341,6 +341,17 @@
                         'helpText' => __('The number of log files to upload concurrently. The lower the number the longer it will take, but the better for memory usage.'),
                         'enabled' => true,
                         'groupClass' => NULL
+                    ),
+                    array(
+                        'name' => 'PreventSleep',
+                        'tabId' => 'advanced',
+                        'title' => __('Prevent Sleep?'),
+                        'type' => _CHECKBOX,
+                        'fieldType' => 'checkbox',
+                        'default' => 1,
+                        'helpText' => __('Stop the player PC power management from Sleeping the PC'),
+                        'enabled' => true,
+                        'groupClass' => NULL
                     )
                 )
             ),