diff --git a/web-assets.conf b/web-assets.conf index 4fa3719..a30b2da 100644 --- a/web-assets.conf +++ b/web-assets.conf @@ -1,14 +1,46 @@ -Alias /_sysassets /usr/share/web-assets - - Options -Indexes - Require all granted + Options -Indexes +FollowSymLinks + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + -Alias /_sysassets/javascript /usr/share/javascript -Alias /_sysassets/js /usr/share/javascript - + Options -Indexes +FollowSymLinks + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + + + Options -Indexes - Require all granted + + # Apache 2.4 + Require all granted + + + # Apache 2.2 + Order deny,allow + Allow from all + + +# These aliases are not made available by default on Fedora < 21 and EPEL < 7. +# They will be available by default in Fedora >= 21 and EPEL >= 7. + +#Alias /.sysassets/fonts /usr/share/fonts +#Alias /.sysassets/javascript /usr/share/javascript +#Alias /.sysassets/js /usr/share/javascript +#Alias /.sysassets /usr/share/web-assets \ No newline at end of file diff --git a/web-assets.spec b/web-assets.spec index e38cdcd..8bd30fc 100644 --- a/web-assets.spec +++ b/web-assets.spec @@ -1,10 +1,10 @@ #disable the httpd stuff while we're waiting on getting the path issues #cleared up -%global enable_httpd 0 +%global enable_httpd 1 Name: web-assets -Version: 4 -Release: 3%{?dist} +Version: 5 +Release: 1%{?dist} Summary: A simple framework for bits pushed to browsers BuildArch: noarch @@ -91,6 +91,13 @@ systemctl reload-or-try-restart httpd.service || : %endif %changelog +* Wed Mar 19 2014 T.C. Hollingsworth - 5-1 +- switch to dot-prefixed Aliases +- order Aliases for compatibility with older Apache releases +- enable webfonts +- enable symlinks in %%{_webassetdir} and %%{_jsdir} +- re-enable httpd subpackage + * Tue Aug 27 2013 T.C. Hollingsworth - 4-3 - use old location for RPM macros on older releases