summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.markdown1
-rw-r--r--Vagrantfile12
-rw-r--r--app/check_setup.php4
-rw-r--r--docs/debian-installation.markdown4
-rw-r--r--docs/docker.markdown23
-rw-r--r--docs/faq.markdown6
-rw-r--r--docs/freebsd-installation.markdown56
-rw-r--r--docs/installation.markdown4
-rw-r--r--docs/vagrant.markdown3
9 files changed, 76 insertions, 37 deletions
diff --git a/README.markdown b/README.markdown
index f5eac51f..c3075757 100644
--- a/README.markdown
+++ b/README.markdown
@@ -89,6 +89,7 @@ Documentation
- [Installation on Ubuntu](docs/ubuntu-installation.markdown)
- [Installation on Debian](docs/debian-installation.markdown)
- [Installation on Centos](docs/centos-installation.markdown)
+- [Installation on FreeBSD](docs/freebsd-installation.markdown)
- [Installation on Windows Server with IIS](docs/windows-iis-installation.markdown)
- [Example with Nginx + HTTPS + SPDY + PHP-FPM](docs/nginx-ssl-php-fpm.markdown)
diff --git a/Vagrantfile b/Vagrantfile
index 2aab5897..1132337c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -60,10 +60,14 @@ Vagrant.configure("2") do |config|
m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
end
- config.vm.define "debian6" do |m|
- m.vm.box = "chef/debian-6.0.10"
- m.vm.provision "shell", inline: $script_sqlite
- m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
+ config.vm.define "centos7" do |m|
+ m.vm.box = "chef/centos-7.0"
+ m.vm.synced_folder ".", "/var/www/html", owner: "apache", group: "apache"
+ end
+
+ config.vm.define "freebsd10" do |m|
+ m.vm.box = "chef/freebsd-10.0"
+ m.vm.synced_folder ".", "/usr/local/www/apache24/data", type: "rsync", owner: "www", group: "www"
end
config.vm.network :forwarded_port, guest: 80, host: 8001
diff --git a/app/check_setup.php b/app/check_setup.php
index afb08f6a..f0059215 100644
--- a/app/check_setup.php
+++ b/app/check_setup.php
@@ -1,8 +1,8 @@
<?php
// PHP 5.3.3 minimum
-if (version_compare(PHP_VERSION, '5.3.3', '<')) {
- die('This software require PHP 5.3.3 minimum');
+if (version_compare(PHP_VERSION, '5.3.7', '<')) {
+ die('This software require PHP 5.3.7 minimum');
}
// Checks for PHP < 5.4
diff --git a/docs/debian-installation.markdown b/docs/debian-installation.markdown
index 10cab44a..7cc9b5b7 100644
--- a/docs/debian-installation.markdown
+++ b/docs/debian-installation.markdown
@@ -24,6 +24,8 @@ rm kanboard-latest.zip
Debian 6 (Squeeze)
------------------
+**Kanboard >= 1.0.10 require at least PHP 5.3.7 and Debian 6 provide PHP 5.3.3 by default**
+
Install Apache and PHP:
```bash
@@ -39,4 +41,4 @@ wget http://kanboard.net/kanboard-latest.zip
unzip kanboard-latest.zip
chown -R www-data:www-data kanboard/data
rm kanboard-latest.zip
-``` \ No newline at end of file
+```
diff --git a/docs/docker.markdown b/docs/docker.markdown
index 33a58006..b4334e1f 100644
--- a/docs/docker.markdown
+++ b/docs/docker.markdown
@@ -2,9 +2,7 @@ How to test Kanboard with Docker?
=================================
Kanboard can run with [Docker](https://www.docker.com).
-You can use the public image or build your own image from the `Dockerfile`.
-
-Actually, the Docker image is based on the master branch (development version).
+There is a `Dockerfile` in the repository to build your own container.
Build your own Docker image
---------------------------
@@ -21,25 +19,6 @@ To run your image in background on the port 80:
docker run -d --name kanboard -p 80:80 -t youruser/kanboard:master
```
-Run the public Kanboard image
------------------------------
-
-This image is stored on the [Docker Hub](https://hub.docker.com).
-
-Fetch the image on your machine:
-
-```bash
-docker pull kanboard/kanboard:master
-```
-
-Run the image:
-
-```bash
-docker run -d --name kanboard -p 80:80 -t kanboard/kanboard:master
-```
-
-Note: This image is not necessary up to date
-
Store your data on a volume
---------------------------
diff --git a/docs/faq.markdown b/docs/faq.markdown
index 2555c777..c8cc8406 100644
--- a/docs/faq.markdown
+++ b/docs/faq.markdown
@@ -45,13 +45,13 @@ The project [eAccelerator seems dead and not updated since 2012](https://github.
We recommend to switch to the last version of PHP because it's bundled with [OPcache](http://php.net/manual/en/intro.opcache.php).
-Why the minimum requirement is PHP 5.3.3 or 5.3.7?
---------------------------------------------------
+Why the minimum requirement is PHP 5.3.7?
+-----------------------------------------
Kanboard use the function `password_hash()` to crypt passwords but it's available only for PHP >= 5.5.
However, there is a backport for [older versions of PHP](https://github.com/ircmaxell/password_compat#requirements).
-This library needs to have at least PHP 5.3.7 to work correctly (with Debian Wheezy, using PHP 5.3.3 should be fine).
+This library require at least PHP 5.3.7 to work correctly.
How to test Kanboard with the PHP built-in web server?
diff --git a/docs/freebsd-installation.markdown b/docs/freebsd-installation.markdown
new file mode 100644
index 00000000..0fd1ac9d
--- /dev/null
+++ b/docs/freebsd-installation.markdown
@@ -0,0 +1,56 @@
+Freebsd Installation
+====================
+
+Freebsd 10
+----------
+
+```bash
+pkg update
+pkg upgrade
+
+# Install PHP with some standard extensions
+pkg install wget unzip mod_php55 \
+ php55-session php55-pdo_sqlite php55-pdo \
+ php55-openssl php55-opcache php55-mbstring \
+ php55-json php55-curl php55-mcrypt \
+ php55-zlib php55-simplexml php55-xml php55-filter \
+ php55-iconv php55-dom php55-ctype
+```
+
+Check if PHP is correctly installed:
+
+```bash
+$ php -v
+PHP 5.5.19 (cli) (built: Nov 19 2014 04:37:37)
+Copyright (c) 1997-2014 The PHP Group
+Zend Engine v2.5.0, Copyright (c) 1998-2014 Zend Technologies
+ with Zend OPcache v7.0.4-dev, Copyright (c) 1999-2014, by Zend Technologies
+```
+
+Enable Apache in your `/etc/rc.conf`:
+
+```bash
+echo apache24_enable="YES" >> /etc/rc.conf
+```
+
+Setting up PHP for Apache, just add those lines into `/usr/local/etc/apache24/Includes/php.conf`:
+
+```bash
+AddType application/x-httpd-php .php
+DirectoryIndex index.php index.html
+```
+
+Then start Apache:
+
+```
+service apache24 start
+```
+
+Install Kanboard:
+
+```bash
+wget http://kanboard.net/kanboard-latest.zip
+unzip kanboard-latest.zip
+chown -R www:www kanboard/data
+rm kanboard-latest.zip
+```
diff --git a/docs/installation.markdown b/docs/installation.markdown
index 319eb271..402d761f 100644
--- a/docs/installation.markdown
+++ b/docs/installation.markdown
@@ -5,9 +5,9 @@ Requirements
------------
- Apache or Nginx
-- PHP >= 5.3.3
+- PHP >= 5.3.7
- PHP extensions required: mbstring and pdo_sqlite (don't forget to enable extensions)
-- A web browser with HTML5 drag and drop support
+- A modern web browser
From the archive (stable version)
---------------------------------
diff --git a/docs/vagrant.markdown b/docs/vagrant.markdown
index b485f310..4195a268 100644
--- a/docs/vagrant.markdown
+++ b/docs/vagrant.markdown
@@ -8,7 +8,6 @@ Several configurations are available:
- Ubuntu 14.04 LTS with Kanboard/Mysql
- Ubuntu 14.04 LTS with Kanboard/Postgresql
- Debian 7.6 with Kanboard/Sqlite
-- Debian 6 with Kanboard/Sqlite
To use those configurations, you have to install the **last version** of Virtualbox and Vagrant.
@@ -17,7 +16,6 @@ Standard boxes can be download from [VagrantCloud](https://vagrantcloud.com):
```bash
vagrant box add ubuntu/trusty64
vagrant box add chef/debian-7.6
-vagrant box add chef/debian-6.0.10
```
If you want to test Kanboard on Ubuntu with Sqlite:
@@ -42,4 +40,3 @@ Available boxes are:
- `vagrant up mysql`
- `vagrant up postgres`
- `vagrant up debian7`
-- `vagrant up debian6`