Merge "relocate /www to /var/www"

puppet-manifests/src/modules/openstack/manifests/horizon.pp

@@ -39,7 +39,7 @@ class openstack::horizon
   $keystone_auth_uri        = $::openstack::keystone::params::auth_uri
   $keystone_host_url        = $::openstack::keystone::params::host_url
 
-  #The intention here is to set up /www as a chroot'ed
+  #The intention here is to set up /var/www as a chroot'ed
   #environment for lighttpd so that it will remain in a jail under /www.
   #The uid and gid for www match the uid and gid in the setup package.
 
@@ -56,22 +56,22 @@ class openstack::horizon
     uid    => '1877',
   }
 
-  file { '/www/tmp':
+  file { '/var/www/tmp':
       ensure => directory,
-      path   => '/www/tmp',
+      path   => '/var/www/tmp',
       mode   => '1700',
   }
 
-  file {'/www/var':
+  file {'/var/www/var':
       ensure  => directory,
-      path    => '/www/var',
+      path    => '/var/www/var',
       owner   => 'www',
       require => User['www']
   }
 
-  file {'/www/var/log':
+  file {'/var/www/var/log':
       ensure  => directory,
-      path    => '/www/var/log',
+      path    => '/var/www/var/log',
       owner   => 'www',
       require => User['www']
   }

puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb

@@ -196,7 +196,7 @@ dir-listing.activate       = "disable"
 ### only root can use these options
 #
 # chroot() to directory (default: no chroot() )
-server.chroot              = "/www"
+server.chroot              = "/var/www"
 
 ## change uid to <uid> (default: don't care)
 server.username            = "www"

puppet-manifests/src/modules/platform/manifests/dcmanager.pp

@@ -9,7 +9,7 @@ class platform::dcmanager::params (
   $service_create = false,
   $deploy_base_dir = '/opt/platform/deploy',
   $iso_base_dir_source = '/opt/platform/iso',
-  $iso_base_dir_target = '/www/pages/iso',
+  $iso_base_dir_target = '/var/www/pages/iso',
 ) {
   include ::platform::params
 

puppet-manifests/src/modules/platform/manifests/deviceimage.pp

@@ -1,6 +1,6 @@
 class platform::deviceimage::params(
   $source_deviceimage_base_dir = '/opt/platform/device_images',
-  $target_deviceimage_base_dir = '/www/pages/device_images',
+  $target_deviceimage_base_dir = '/var/www/pages/device_images',
 ) {}
 
 class platform::deviceimage

puppet-manifests/src/modules/platform/manifests/helm.pp

@@ -1,6 +1,6 @@
 class platform::helm::repositories::params(
   $source_helm_repos_base_dir = '/opt/platform/helm_charts',
-  $target_helm_repos_base_dir = '/www/pages/helm_charts',
+  $target_helm_repos_base_dir = '/var/www/pages/helm_charts',
   $helm_repositories = [ 'stx-platform', 'starlingx' ],
 ) {}