tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

installation: get rid of .htaccess, less automake 

Trying to remove a bunch of autoconf and .htaccess-related stuff.
This commit is the last one from a series now finally allowing to run
icingaweb directly from a git checkout.

refs #4075
This commit is contained in:
Thomas Gelf 2014-06-05 14:54:00 +00:00
parent 20b43a92f1
commit 176588c87d
10 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf
View File

@ -1,10 +1,21 @@
<Directory "/var/www/html/icingaweb">
Options -Indexes
AllowOverride All
Options SymLinksIfOwnerMatch
AllowOverride None
Order allow,deny
Allow from all
# SetEnv ICINGAWEB_CONFIGDIR /etc/icingaweb
EnableSendfile Off
RewriteEngine on
RewriteBase /icingaweb/
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
php_value xdebug.idekey PHPSTORM
</Directory>

11
.vagrant-puppet/files/var/www/html/icingaweb/.htaccess
View File

@ -1,11 +0,0 @@
RewriteEngine on
RewriteBase /icingaweb
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
php_flag short_open_tag on
php_value xdebug.idekey PHPSTORM

6
.vagrant-puppet/manifests/default.pp
View File

@ -767,12 +767,6 @@ file { '/var/www/html/icingaweb/css.php':
ensure => absent,
}
file { '/var/www/html/icingaweb/.htaccess':
source => 'puppet:////vagrant/.vagrant-puppet/files/var/www/html/icingaweb/.htaccess',
owner => 'apache',
group => 'apache',
}
file { '/etc/httpd/conf.d/icingaweb.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/httpd/conf.d/icingaweb.conf',
require => Package['apache'],

3
configure vendored
View File

@ -2950,7 +2950,7 @@ fi
#
# Create config files
#
ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/.htaccess public/index.php"
ac_config_files="$ac_config_files Makefile config/authentication.ini config/config.ini config/resources.ini config/modules/monitoring/backends.ini config/modules/monitoring/instances.ini etc/apache/icingaweb.conf public/index.php"
#
@ -3669,7 +3669,6 @@ do
"config/modules/monitoring/backends.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/backends.ini" ;;
"config/modules/monitoring/instances.ini") CONFIG_FILES="$CONFIG_FILES config/modules/monitoring/instances.ini" ;;
"etc/apache/icingaweb.conf") CONFIG_FILES="$CONFIG_FILES etc/apache/icingaweb.conf" ;;
"public/.htaccess") CONFIG_FILES="$CONFIG_FILES public/.htaccess" ;;
"public/index.php") CONFIG_FILES="$CONFIG_FILES public/index.php" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

1
configure.ac
View File

@ -440,7 +440,6 @@ AC_CONFIG_FILES([
config/modules/monitoring/backends.ini
config/modules/monitoring/instances.ini
etc/apache/icingaweb.conf
public/.htaccess
public/index.php
])

19
etc/apache/icingaweb.conf.in
View File

@ -1,12 +1,21 @@
Alias @web_path@ @prefix@/public
Alias @web_path@ "@prefix@/public"
<Directory "@prefix@/public">
Options -Indexes
AllowOverride All
Options SymLinksIfOwnerMatch
AllowOverride None
Order allow,deny
Allow from all
SetEnv ICINGAWEB_CONFIGDIR @icingaweb_config_path@
EnableSendfile Off
RewriteEngine on
RewriteBase @web_path@/
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]
</Directory>

5
icingaweb2.spec
View File

@ -164,9 +164,8 @@ install -D -m0644 packages/rhel/etc/httpd/conf.d/icingaweb.conf %{buildroot}/%{a
%{__cp} -r application library modules public %{buildroot}/%{sharedir}/
# install index.php, .htaccess
# install index.php
install -m0644 packages/rhel/usr/share/icingaweb/public/index.php %{buildroot}/%{sharedir}/public/index.php
install -m0644 packages/rhel/usr/share/icingaweb/public/.htaccess %{buildroot}/%{sharedir}/public/.htaccess
# use the vagrant config for configuration for now - TODO
%{__cp} -r .vagrant-puppet/files/etc/icingaweb %{buildroot}/%{_sysconfdir}/
@ -183,8 +182,6 @@ install -D -m0755 bin/icingacli %{buildroot}/usr/bin/icingacli
# install sql schema files as example
# delete all *.in files
rm -f %{buildroot}/%{_datadir}/%{name}/public/index.php.in
rm -f %{buildroot}/%{_datadir}/%{name}/public/.htaccess.in
%pre
# Add apacheuser in the icingacmd group

2
public/.gitignore vendored
View File

@ -1,2 +0,0 @@
.htaccess
index.php

7
public/.htaccess.in
View File

@ -1,7 +0,0 @@
RewriteEngine on
RewriteBase @web_path@
RewriteCond %{REQUEST_FILENAME} -s [OR]
RewriteCond %{REQUEST_FILENAME} -l [OR]
RewriteCond %{REQUEST_FILENAME} -d
RewriteRule ^.*$ - [NC,L]
RewriteRule ^.*$ index.php [NC,L]

1
public/index.php.in → public/index.php
View File

@ -1,4 +1,3 @@
<?php
$_SERVER['ICINGAWEB_CONFIGDIR'] = '@icingaweb_config_path@';
require_once dirname(__DIR__). '/library/Icinga/Application/webrouter.php';