added ability to customize the webapp appearance

5 files changed, 26 insertions, 2 deletions

diff --git a/provider_base/files/branding/head.scss b/provider_base/files/branding/head.scss
new file mode 100644
index 00000000..c100a004
--- /dev/null
+++ b/provider_base/files/branding/head.scss
@@ -0,0 +1 @@
+// no head.scss set
diff --git a/provider_base/files/branding/tail.scss b/provider_base/files/branding/tail.scss
new file mode 100644
index 00000000..919aeec6
--- /dev/null
+++ b/provider_base/files/branding/tail.scss
@@ -0,0 +1 @@
+// no tail.scss set
diff --git a/provider_base/provider.json b/provider_base/provider.json
index de5ad446..b659d47b 100644
--- a/provider_base/provider.json
+++ b/provider_base/provider.json
@@ -25,5 +25,6 @@
   },
   "vagrant":{
     "network":"10.5.5.0/24"
-  }
+  },
+  "hiera_sync_destination": "/etc/leap"
 }
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index e40ed0ca..311f1284 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -2,7 +2,11 @@
   "webapp": {
     "modules": ["user", "billing", "help"],
     "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
-    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
+    "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]",
+    "favicon": "= file_path 'branding/favicon.ico'",
+    "tail_scss": "= file_path 'branding/tail.scss'",
+    "head_scss": "= file_path 'branding/head.scss'",
+    "img_dir": "= file_path 'branding/img'"
   },
   "definition_files": {
     "provider": "= file :provider_json_template",
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 22695966..f7c6565e 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -5,6 +5,7 @@ class site_webapp {
   $eip_service      = $definition_files['eip_service']
   $node_domain      = hiera('domain')
   $provider_domain  = $node_domain['full_suffix']
+  $webapp           = hiera('webapp')
 
   Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
 
@@ -70,6 +71,22 @@ class site_webapp {
     '/srv/leap-webapp/public/config/eip-service.json':
       content => $eip_service,
       owner   => leap-webapp, group => leap-webapp, mode => '0644';
+
+    '/srv/leap-webapp/public/favicon.ico':
+      ensure => 'link',
+      target => $webapp['favicon'];
+
+    '/srv/leap-webapp/app/assets/stylesheets/tail.scss':
+      ensure => 'link',
+      target => $webapp['tail_scss'];
+
+    '/srv/leap-webapp/app/assets/stylesheets/head.scss':
+      ensure => 'link',
+      target => $webapp['head_scss'];
+
+    '/srv/leap-webapp/public/img':
+       ensure => 'link',
+       target => $webapp['img_dir'];
   }
 
   file {