From 8674e8436231a4741530cd28d9792193b26cdaab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20P=C3=A9rez=20Crespo?= <jaime.perez@uninett.no>
Date: Tue, 25 Feb 2014 10:18:57 +0000
Subject: [PATCH] New instructions on how to install from github.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3391 44740490-163a-0410-bde0-09ae8108e29a
---
docs/index.txt | 2 +-
docs/simplesamlphp-install-repo.txt | 42 +++++++++++++++++++++++++++++
docs/simplesamlphp-install.txt | 2 +-
3 files changed, 44 insertions(+), 2 deletions(-)
create mode 100644 docs/simplesamlphp-install-repo.txt
diff --git a/docs/index.txt b/docs/index.txt
index a0148dbb1..4f392e676 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -10,7 +10,7 @@ SimpleSAMLphp Documentation
* [Upgrade notes for version 1.7](simplesamlphp-upgrade-notes-1.7)
* [Upgrade notes for version 1.6](simplesamlphp-upgrade-notes-1.6)
* [Upgrade notes for version 1.5](simplesamlphp-upgrade-notes-1.5)
- * [Installation from Subversion](simplesamlphp-subversion)
+ * [Installation from the repository](simplesamlphp-install-repo)
* [Changelog](simplesamlphp-changelog)
* [Using simpleSAMLphp as a SAML Service Provider](simplesamlphp-sp)
* [Hosted SP Configuration Reference](./saml:sp)
diff --git a/docs/simplesamlphp-install-repo.txt b/docs/simplesamlphp-install-repo.txt
new file mode 100644
index 000000000..5df4969d8
--- /dev/null
+++ b/docs/simplesamlphp-install-repo.txt
@@ -0,0 +1,42 @@
+Installing SimpleSAMLphp from the repository
+============================================
+
+These are some notes about running SimpleSAMLphp from subversion.
+
+Installing from github
+----------------------
+
+Go to the directory where you want to install SimpleSAMLphp:
+
+ cd /var
+
+Then do a git clone:
+
+ git clone git@github.com:simplesamlphp/simplesamlphp.git simplesamlphp
+
+Initialize configuration and metadata:
+
+ cd /var/simplesamlphp
+ cp -r config-templates/* config/
+ cp -r metadata-templates/* metadata/
+
+Install the external dependencies with Composer (you can refer to http://getcomposer.org/ to get detailed
+instructions on how to install Composer itself):
+
+ php composer.phar install
+
+
+Upgrading
+---------
+
+Go to the root directory of your simpleSAMLphp installation:
+
+ cd /var/simplesamlphp
+
+Ask git to update to the latest version:
+
+ git fetch origin
+ git pull master
+
+Install the external dependencies with Composer (http://getcomposer.org/):
+ php composer.phar install
diff --git a/docs/simplesamlphp-install.txt b/docs/simplesamlphp-install.txt
index 8162a9e93..7178a7cd7 100644
--- a/docs/simplesamlphp-install.txt
+++ b/docs/simplesamlphp-install.txt
@@ -26,7 +26,7 @@ Development version
--------------------
This document is about the latest stable version of simpleSAMLphp.
-If you want to install the development version, look at the instructions for [installing simpleSAMLphp from Subversion](simplesamlphp-subversion).
+If you want to install the development version, look at the instructions for [installing simpleSAMLphp from the repository](simplesamlphp-install-repo).
Prerequisites
--
GitLab