[Git][noosfero/noosfero][master] 2 commits: Fixes noosfero-apache config for public folder

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
7228e503 by Gabriel Silva at 2018-11-21T16:36:27Z
Fixes noosfero-apache config for public folder

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
745cbdd4 by Rodrigo Souto at 2018-11-26T15:49:59Z
Merge branch 'apache-conf' into 'master'

Fixes noosfero-apache config for public folder

See merge request noosfero/noosfero!1646
- - - - -


2 changed files:

- config/environments/production.rb
- debian/apache2/virtualhost.conf


Changes:

=====================================
config/environments/production.rb
=====================================
@@ -9,7 +9,7 @@ Noosfero::Application.configure do
   # config.action_controller.perform_caching = true
 
   # Enable Rails's static asset server (Apache or nginx should do this)
-  config.serve_static_assets = true
+  config.serve_static_assets = false
 
   # Compress JavaScripts (sass-rails enable compression of CSS by default)
   config.assets.js_compressor = :uglifier


=====================================
debian/apache2/virtualhost.conf
=====================================
@@ -1,9 +1,10 @@
 DocumentRoot "/usr/share/noosfero/public"
-<Directory "/var/lib/noosfero/current/public">
+<Directory "/usr/share/noosfero/public">
   Options +FollowSymLinks -Indexes
   AllowOverride None
   Order Allow,Deny
   Allow from all
+  Header set Access-Control-Allow-Origin "*"
 </Directory>
 
 RewriteEngine On
@@ -25,6 +26,7 @@ RewriteRule ^(/articles/.*) ${private_files:$1} [P,QSA,L]
 RewriteRule ^/$ /index.html [QSA]
 
 # Rewrite to check for Rails cached page
+RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
 RewriteRule ^([^.]+)$ $1.html [QSA]
 
 RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e87361a5ab2a12eb7910f668c847a7ae07ec6043...745cbdd44dc3671795f647cb0d305dc5128bfc57

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e87361a5ab2a12eb7910f668c847a7ae07ec6043...745cbdd44dc3671795f647cb0d305dc5128bfc57
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20181126/e6c21afc/attachment-0001.html>