Skip to content
This repository has been archived by the owner on Dec 17, 2023. It is now read-only.

Commit

Permalink
Error window when switching status (online/offline) (Issue #40)
Browse files Browse the repository at this point in the history
Refresh aliases and vhosts when switching status (Issue #39)
Localhost menu item wrong redirect bug (Issue #38)
Launch on startup item (Issue #29)
Check version on homepage and startup (Issue #8)
Clean some var_dump
Bug with depreciated functions on PHP 5.6 (homepage)
Bug with Gitlist
  • Loading branch information
crazy-max committed Apr 18, 2014
1 parent 0b0c181 commit b8eb802
Show file tree
Hide file tree
Showing 78 changed files with 2,604 additions and 369 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,16 @@
# Changelog

## 1.0.6 (2014/04/18)

* Error window when switching status (online/offline) ([Issue #40](https://github.com/crazy-max/neard/issues/40))
* Refresh aliases and vhosts when switching status ([Issue #39](https://github.com/crazy-max/neard/issues/39))
* Localhost menu item wrong redirect bug ([Issue #38](https://github.com/crazy-max/neard/issues/38))
* Launch on startup item ([Issue #29](https://github.com/crazy-max/neard/issues/29))
* Check version on homepage and startup ([Issue #8](https://github.com/crazy-max/neard/issues/8))
* Clean some var_dump
* Bug with depreciated functions on PHP 5.6 (homepage)
* Bug with Gitlist

## 1.0.5 (2014/04/06)

* Move Apache rewrite logs ([Issue #37](https://github.com/crazy-max/neard/issues/37))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -43,7 +43,7 @@ And many other features.

Neard is [available on SourceForge](https://sourceforge.net/projects/neard/) :

* Latest release : [Neard 1.0.5](https://sourceforge.net/projects/neard/files/Releases/1.0.5/neard-1.0.5.zip/download) (2014/04/06)
* Latest release : [Neard 1.0.6](https://sourceforge.net/projects/neard/files/Releases/1.0.6/neard-1.0.6.zip/download) (2014/04/18)
* [Patches](https://sourceforge.net/projects/neard/files/Patches/) : to migrate from older release to the latest.
* [Addons](https://sourceforge.net/projects/neard/files/Addons/) : other versions of binaries (Apache, PHP, MYSQL, MariaDB, etc...).
* [Tools](https://sourceforge.net/projects/neard/files/Tools/) : useful tools for Neard.
Expand Down
10 changes: 6 additions & 4 deletions alias/gitlist.conf
@@ -1,4 +1,4 @@
Alias /gitlist "C:/neard/apps/gitlist/gitlist0.4.0/"
Alias /gitlist "V:/neard/www/github/neard/apps/gitlist/gitlist0.4.0/"

# to give access to gitlist from outside
# replace the lines
Expand All @@ -13,10 +13,12 @@ Alias /gitlist "C:/neard/apps/gitlist/gitlist0.4.0/"
# Allow from all
#

<Directory "C:/neard/apps/gitlist/gitlist0.4.0/">
<Directory "V:/neard/www/github/neard/apps/gitlist/gitlist0.4.0/">
Options Indexes FollowSymLinks MultiViews
AllowOverride all
Order Deny,Allow
# START switchOnline tag - Do not replace!
Order Deny,Allow
Deny from all
Allow from ::1 127.0.0.1 localhost
Allow from 127.0.0.1 ::1
# END switchOnline tag - Do not replace!
</Directory>
10 changes: 6 additions & 4 deletions alias/phpmyadmin.conf
@@ -1,4 +1,4 @@
Alias /phpmyadmin "C:/neard/apps/phpmyadmin/phpmyadmin4.0.4/"
Alias /phpmyadmin "V:/neard/www/github/neard/apps/phpmyadmin/phpmyadmin4.0.4/"

# to give access to phpmyadmin from outside
# replace the lines
Expand All @@ -13,10 +13,12 @@ Alias /phpmyadmin "C:/neard/apps/phpmyadmin/phpmyadmin4.0.4/"
# Allow from all
#

<Directory "C:/neard/apps/phpmyadmin/phpmyadmin4.0.4/">
<Directory "V:/neard/www/github/neard/apps/phpmyadmin/phpmyadmin4.0.4/">
Options Indexes FollowSymLinks MultiViews
AllowOverride all
Order Deny,Allow
# START switchOnline tag - Do not replace!
Order Deny,Allow
Deny from all
Allow from 127.0.0.1 ::1 localhost
Allow from 127.0.0.1 ::1
# END switchOnline tag - Do not replace!
</Directory>
2 changes: 1 addition & 1 deletion alias/svn.conf
@@ -1,5 +1,5 @@
<Location /svn>
DAV svn
SVNParentPath "C:/neard/svnrepos"
SVNParentPath "V:/neard/www/github/neard/svnrepos"
SVNListParentPath On
</Location>
10 changes: 6 additions & 4 deletions alias/webgrind.conf
@@ -1,4 +1,4 @@
Alias /webgrind "C:/neard/apps/webgrind/webgrind1.0/"
Alias /webgrind "V:/neard/www/github/neard/apps/webgrind/webgrind1.0/"

# to give access to webgrind from outside
# replace the lines
Expand All @@ -13,10 +13,12 @@ Alias /webgrind "C:/neard/apps/webgrind/webgrind1.0/"
# Allow from all
#

<Directory "C:/neard/apps/webgrind/webgrind1.0/">
<Directory "V:/neard/www/github/neard/apps/webgrind/webgrind1.0/">
Options Indexes FollowSymLinks MultiViews
AllowOverride all
Order Deny,Allow
# START switchOnline tag - Do not replace!
Order Deny,Allow
Deny from all
Allow from 127.0.0.1 ::1 localhost
Allow from 127.0.0.1 ::1
# END switchOnline tag - Do not replace!
</Directory>
10 changes: 6 additions & 4 deletions alias/websvn.conf
@@ -1,4 +1,4 @@
Alias /websvn "C:/neard/apps/websvn/websvn2.3.3/"
Alias /websvn "V:/neard/www/github/neard/apps/websvn/websvn2.3.3/"

# to give access to websvn from outside
# replace the lines
Expand All @@ -13,10 +13,12 @@ Alias /websvn "C:/neard/apps/websvn/websvn2.3.3/"
# Allow from all
#

<Directory "C:/neard/apps/websvn/websvn2.3.3/">
<Directory "V:/neard/www/github/neard/apps/websvn/websvn2.3.3/">
Options Indexes FollowSymLinks MultiViews
AllowOverride all
Order Deny,Allow
# START switchOnline tag - Do not replace!
Order Deny,Allow
Deny from all
Allow from 127.0.0.1 ::1 localhost
Allow from 127.0.0.1 ::1
# END switchOnline tag - Do not replace!
</Directory>
2 changes: 1 addition & 1 deletion apps/gitlist/gitlist0.4.0/config.ini
@@ -1,5 +1,5 @@
[git]
client = 'C:/neard/tools/git/git1.8.4/bin/git.exe'
client = 'V:/neard/www/github/neard/tools/git/git1.8.4/bin/git.exe'
repositories[] = ''

[app]
Expand Down
4 changes: 2 additions & 2 deletions apps/websvn/websvn2.3.3/include/config.php
@@ -1,7 +1,7 @@
<?php


$config->parentPath('C:/neard/svnrepos');
$config->parentPath('V:/neard/www/github/neard/svnrepos');

$config->addTemplatePath($locwebsvnreal.'/templates/calm/');
$config->addTemplatePath($locwebsvnreal.'/templates/BlueGrey/');
Expand All @@ -19,5 +19,5 @@

$config->expandTabsBy(8);

$config->setTempDir('C:/neard/tmp');
$config->setTempDir('V:/neard/www/github/neard/tmp');

40 changes: 20 additions & 20 deletions bin/apache/apache2.2.22/conf/httpd.conf
Expand Up @@ -14,8 +14,8 @@
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
# with ServerRoot set to "C:/neard/bin/apache/apache2.2.22" will be interpreted by the
# server as "C:/neard/bin/apache/apache2.2.22/logs/foo.log".
# with ServerRoot set to "V:/neard/www/github/neard/bin/apache/apache2.2.22" will be interpreted by the
# server as "V:/neard/www/github/neard/bin/apache/apache2.2.22/logs/foo.log".
#
# NOTE: Where filenames are specified, you must use forward slashes
# instead of backslashes (e.g., "c:/apache" instead of "c:\apache").
Expand All @@ -32,7 +32,7 @@
# at a local disk. If you wish to share the same ServerRoot for multiple
# httpd daemons, you will need to change at least LockFile and PidFile.
#
ServerRoot "C:/neard/bin/apache/apache2.2.22"
ServerRoot "V:/neard/www/github/neard/bin/apache/apache2.2.22"

#
# Listen: Allows you to bind Apache to specific IP addresses and/or
Expand Down Expand Up @@ -129,9 +129,9 @@ LoadModule ssl_module modules/mod_ssl.so
#LoadModule version_module modules/mod_version.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so

PHPIniDir "C:/neard/bin/php/php5.3.13"
LoadFile "C:/neard/bin/php/php5.3.13/php5ts.dll"
LoadModule php5_module "C:/neard/bin/php/php5.3.13/php5apache2_2.dll"
PHPIniDir "V:/neard/www/github/neard/bin/php/php5.3.13"
LoadFile "V:/neard/www/github/neard/bin/php/php5.3.13/php5ts.dll"
LoadModule php5_module "V:/neard/www/github/neard/bin/php/php5.3.13/php5apache2_2.dll"

<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
Expand Down Expand Up @@ -182,7 +182,7 @@ ServerName localhost:80
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
DocumentRoot "C:/neard/www/"
DocumentRoot "V:/neard/www/github/neard/www/"

#
# Each directory to which Apache has access can be configured with respect
Expand All @@ -209,7 +209,7 @@ DocumentRoot "C:/neard/www/"
#
# This should be changed to whatever you set DocumentRoot to.
#
<Directory "C:/neard/www/">
<Directory "V:/neard/www/github/neard/www/">
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
Expand Down Expand Up @@ -268,7 +268,7 @@ DocumentRoot "C:/neard/www/"
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
ErrorLog "C:/neard/logs/apache_error.log"
ErrorLog "V:/neard/www/github/neard/logs/apache_error.log"

#
# LogLevel: Control the number of messages logged to the error_log.
Expand Down Expand Up @@ -297,7 +297,7 @@ LogLevel warn
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
CustomLog "C:/neard/logs/apache_access.log" combined
CustomLog "V:/neard/www/github/neard/logs/apache_access.log" combined

#
# If you prefer a logfile with access, agent, and referer information
Expand Down Expand Up @@ -333,7 +333,7 @@ LogLevel warn
# client. The same rules about trailing "/" apply to ScriptAlias
# directives as to Alias.
#
ScriptAlias /cgi-bin/ "C:/neard/cgi-bin/"
ScriptAlias /cgi-bin/ "V:/neard/www/github/neard/cgi-bin/"

</IfModule>

Expand All @@ -346,10 +346,10 @@ LogLevel warn
</IfModule>

#
# "C:/neard/bin/apache/apache2.2.22/cgi-bin" should be changed to whatever your ScriptAliased
# "V:/neard/www/github/neard/bin/apache/apache2.2.22/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "C:/neard/cgi-bin">
<Directory "V:/neard/www/github/neard/cgi-bin">
AllowOverride None
Options None
Order allow,deny
Expand Down Expand Up @@ -496,19 +496,19 @@ SSLRandomSeed connect builtin
</IfModule>

# Homepage alias
Include "C:/neard/core/resources/homepage/alias.conf"
Include "V:/neard/www/github/neard/core/resources/homepage/alias.conf"

# VHosts
NameVirtualHost *:80
<VirtualHost *:80>
DocumentRoot "C:/neard/www/"
DocumentRoot "V:/neard/www/github/neard/www/"
ServerName localhost
ErrorLog "C:/neard/logs/localhost_error.log"
CustomLog "C:/neard/logs/localhost_access.log" combined
RewriteLog "C:/neard/logs/localhost_rewrite.log"
ErrorLog "V:/neard/www/github/neard/logs/localhost_error.log"
CustomLog "V:/neard/www/github/neard/logs/localhost_access.log" combined
RewriteLog "V:/neard/www/github/neard/logs/localhost_rewrite.log"
RewriteLogLevel 3
</VirtualHost>
Include "C:/neard/vhosts/*"
Include "V:/neard/www/github/neard/vhosts/*"

# Aliases
Include "C:/neard/alias/*"
Include "V:/neard/www/github/neard/alias/*"
40 changes: 20 additions & 20 deletions bin/apache/apache2.2.27/conf/httpd.conf
Expand Up @@ -14,8 +14,8 @@
# of the server's control files begin with "/" (or "drive:/" for Win32), the
# server will use that explicit path. If the filenames do *not* begin
# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
# with ServerRoot set to "C:/neard/bin/apache/apache2.2.27" will be interpreted by the
# server as "C:/neard/bin/apache/apache2.2.27/logs/foo.log".
# with ServerRoot set to "V:/neard/www/github/neard/bin/apache/apache2.2.27" will be interpreted by the
# server as "V:/neard/www/github/neard/bin/apache/apache2.2.27/logs/foo.log".
#
# NOTE: Where filenames are specified, you must use forward slashes
# instead of backslashes (e.g., "c:/apache" instead of "c:\apache").
Expand All @@ -32,7 +32,7 @@
# at a local disk. If you wish to share the same ServerRoot for multiple
# httpd daemons, you will need to change at least LockFile and PidFile.
#
ServerRoot "C:/neard/bin/apache/apache2.2.27"
ServerRoot "V:/neard/www/github/neard/bin/apache/apache2.2.27"

#
# Listen: Allows you to bind Apache to specific IP addresses and/or
Expand Down Expand Up @@ -129,9 +129,9 @@ LoadModule ssl_module modules/mod_ssl.so
#LoadModule version_module modules/mod_version.so
#LoadModule vhost_alias_module modules/mod_vhost_alias.so

PHPIniDir "C:/neard/bin/php/php5.3.13"
LoadFile "C:/neard/bin/php/php5.3.13/php5ts.dll"
LoadModule php5_module "C:/neard/bin/php/php5.3.13/php5apache2_2.dll"
PHPIniDir "V:/neard/www/github/neard/bin/php/php5.3.13"
LoadFile "V:/neard/www/github/neard/bin/php/php5.3.13/php5ts.dll"
LoadModule php5_module "V:/neard/www/github/neard/bin/php/php5.3.13/php5apache2_2.dll"

<IfModule !mpm_netware_module>
<IfModule !mpm_winnt_module>
Expand Down Expand Up @@ -182,7 +182,7 @@ ServerName localhost:80
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
#
DocumentRoot "C:/neard/www/"
DocumentRoot "V:/neard/www/github/neard/www/"

#
# Each directory to which Apache has access can be configured with respect
Expand All @@ -209,7 +209,7 @@ DocumentRoot "C:/neard/www/"
#
# This should be changed to whatever you set DocumentRoot to.
#
<Directory "C:/neard/www/">
<Directory "V:/neard/www/github/neard/www/">
#
# Possible values for the Options directive are "None", "All",
# or any combination of:
Expand Down Expand Up @@ -268,7 +268,7 @@ DocumentRoot "C:/neard/www/"
# logged here. If you *do* define an error logfile for a <VirtualHost>
# container, that host's errors will be logged there and not here.
#
ErrorLog "C:/neard/logs/apache_error.log"
ErrorLog "V:/neard/www/github/neard/logs/apache_error.log"

#
# LogLevel: Control the number of messages logged to the error_log.
Expand Down Expand Up @@ -297,7 +297,7 @@ LogLevel warn
# define per-<VirtualHost> access logfiles, transactions will be
# logged therein and *not* in this file.
#
CustomLog "C:/neard/logs/apache_access.log" combined
CustomLog "V:/neard/www/github/neard/logs/apache_access.log" combined

#
# If you prefer a logfile with access, agent, and referer information
Expand Down Expand Up @@ -333,7 +333,7 @@ LogLevel warn
# client. The same rules about trailing "/" apply to ScriptAlias
# directives as to Alias.
#
ScriptAlias /cgi-bin/ "C:/neard/cgi-bin/"
ScriptAlias /cgi-bin/ "V:/neard/www/github/neard/cgi-bin/"

</IfModule>

Expand All @@ -346,10 +346,10 @@ LogLevel warn
</IfModule>

#
# "C:/neard/bin/apache/apache2.2.27/cgi-bin" should be changed to whatever your ScriptAliased
# "V:/neard/www/github/neard/bin/apache/apache2.2.27/cgi-bin" should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
#
<Directory "C:/neard/cgi-bin">
<Directory "V:/neard/www/github/neard/cgi-bin">
AllowOverride None
Options None
Order allow,deny
Expand Down Expand Up @@ -503,19 +503,19 @@ SSLRandomSeed connect builtin
</IfModule>

# Homepage alias
Include "C:/neard/core/resources/homepage/alias.conf"
Include "V:/neard/www/github/neard/core/resources/homepage/alias.conf"

# VHosts
NameVirtualHost *:80
<VirtualHost *:80>
DocumentRoot "C:/neard/www/"
DocumentRoot "V:/neard/www/github/neard/www/"
ServerName localhost
ErrorLog "C:/neard/logs/localhost_error.log"
CustomLog "C:/neard/logs/localhost_access.log" combined
RewriteLog "C:/neard/logs/localhost_rewrite.log"
ErrorLog "V:/neard/www/github/neard/logs/localhost_error.log"
CustomLog "V:/neard/www/github/neard/logs/localhost_access.log" combined
RewriteLog "V:/neard/www/github/neard/logs/localhost_rewrite.log"
RewriteLogLevel 3
</VirtualHost>
Include "C:/neard/vhosts/*"
Include "V:/neard/www/github/neard/vhosts/*"

# Aliases
Include "C:/neard/alias/*"
Include "V:/neard/www/github/neard/alias/*"

0 comments on commit b8eb802

Please sign in to comment.