From b6ab4b7355afbeae6f82bc157cc5d1804c377721 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 21 Jul 2014 17:36:22 +0200
Subject: [news] minor doxygen comment fix

---
 modules/news.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/news.inc.php b/modules/news.inc.php
index 2f169fb5..c8f102c0 100644
--- a/modules/news.inc.php
+++ b/modules/news.inc.php
@@ -5,8 +5,8 @@ class Page_News extends Page
 	/**
 	 * Member variables needed to represent a news entry.
 	 *
-	 * $newsId		int		ID of the news entry attributed by the database.
-	 * $newsTitle	string	Title of the entry.
+	 * @var newsId	int		ID of the news entry attributed by the database.
+	 * @var string	Title of the entry.
 	 * $newsContent	string	Content as text. (TODO: html-Support?)
 	 * $newsDate	string	Unix epoch date of the news' creation.
 	 */
-- 
cgit v1.2.3-55-g7522


From 34bc39c29b1e1051fab25eef1be6931d55424452 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Fri, 25 Jul 2014 15:34:33 +0200
Subject: [slx-admin] config.php renamed to config.php.example, set marker for
 SSPS

---
 config.php         | 26 --------------------------
 config.php.example | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 config.php
 create mode 100644 config.php.example

diff --git a/config.php b/config.php
deleted file mode 100644
index 179e1a16..00000000
--- a/config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// This might leak sensitive information. Never enable in production!
-define('CONFIG_DEBUG', true);
-
-define('CONFIG_SESSION_DIR', '/tmp/openslx');
-define('CONFIG_SESSION_TIMEOUT', 86400 * 3);
-
-//define('CONFIG_SQL_BACKEND', 'mysql');
-//define('CONFIG_SQL_HOST', 'localhost');
-define('CONFIG_SQL_DSN', 'mysql:dbname=openslx;host=localhost');
-define('CONFIG_SQL_USER', 'openslx');
-define('CONFIG_SQL_PASS', 'geheim');
-define('CONFIG_SQL_FORCE_UTF8', false);
-//define('CONFIG_SQL_DB', 'openslx');
-
-define('CONFIG_TGZ_LIST_DIR', '/opt/openslx/configs');
-
-define('CONFIG_REMOTE_ML',  'http://mltk.boot.openslx.org/update/new');
-
-define('CONFIG_TFTP_DIR', '/srv/openslx/tftp');
-define('CONFIG_HTTP_DIR', '/srv/openslx/www/boot');
-
-define('CONFIG_IPXE_DIR', '/opt/openslx/ipxe');
-
-define('CONFIG_VMSTORE_DIR', '/srv/openslx/nfs');
diff --git a/config.php.example b/config.php.example
new file mode 100644
index 00000000..179e1a16
--- /dev/null
+++ b/config.php.example
@@ -0,0 +1,26 @@
+<?php
+
+// This might leak sensitive information. Never enable in production!
+define('CONFIG_DEBUG', true);
+
+define('CONFIG_SESSION_DIR', '/tmp/openslx');
+define('CONFIG_SESSION_TIMEOUT', 86400 * 3);
+
+//define('CONFIG_SQL_BACKEND', 'mysql');
+//define('CONFIG_SQL_HOST', 'localhost');
+define('CONFIG_SQL_DSN', 'mysql:dbname=openslx;host=localhost');
+define('CONFIG_SQL_USER', 'openslx');
+define('CONFIG_SQL_PASS', 'geheim');
+define('CONFIG_SQL_FORCE_UTF8', false);
+//define('CONFIG_SQL_DB', 'openslx');
+
+define('CONFIG_TGZ_LIST_DIR', '/opt/openslx/configs');
+
+define('CONFIG_REMOTE_ML',  'http://mltk.boot.openslx.org/update/new');
+
+define('CONFIG_TFTP_DIR', '/srv/openslx/tftp');
+define('CONFIG_HTTP_DIR', '/srv/openslx/www/boot');
+
+define('CONFIG_IPXE_DIR', '/opt/openslx/ipxe');
+
+define('CONFIG_VMSTORE_DIR', '/srv/openslx/nfs');
-- 
cgit v1.2.3-55-g7522


From e65e1287666d7836095768a2dacceb7d71b65029 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Fri, 25 Jul 2014 15:37:41 +0200
Subject: [slx-admin] commented marker setting

---
 config.php.example | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config.php.example b/config.php.example
index 179e1a16..d8fcd11a 100644
--- a/config.php.example
+++ b/config.php.example
@@ -10,7 +10,10 @@ define('CONFIG_SESSION_TIMEOUT', 86400 * 3);
 //define('CONFIG_SQL_HOST', 'localhost');
 define('CONFIG_SQL_DSN', 'mysql:dbname=openslx;host=localhost');
 define('CONFIG_SQL_USER', 'openslx');
-define('CONFIG_SQL_PASS', 'geheim');
+// This marker %MYSQL_OPENSLX_PASS% is meant for automated patching
+// via SSPS (satellite server preparation script) - do not change it
+// if you plan to run this script afterwards.
+define('CONFIG_SQL_PASS', '%MYSQL_OPENSLX_PASS%');
 define('CONFIG_SQL_FORCE_UTF8', false);
 //define('CONFIG_SQL_DB', 'openslx');
 
-- 
cgit v1.2.3-55-g7522


From 6856e6c1fa754d8c3a695379e80af8692bdc5e30 Mon Sep 17 00:00:00 2001
From: root
Date: Tue, 29 Jul 2014 14:45:14 +0200
Subject: [slx-admin] Out-commented several entries in DB import file
 (conflicted with satellite_setup script)

---
 DB_SCRIBBLE | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/DB_SCRIBBLE b/DB_SCRIBBLE
index 5b5befa2..1dd81685 100644
--- a/DB_SCRIBBLE
+++ b/DB_SCRIBBLE
@@ -1,7 +1,8 @@
-CREATE DATABASE openslx;
-CREATE USER openslx@localhost;
-SET PASSWORD FOR openslx@localhost = Password('geheim');
-GRANT ALL ON openslx.* TO openslx@localhost;
+-- Entries commented out: satellite_install script won't like them
+-- CREATE DATABASE openslx;
+-- CREATE USER openslx@localhost;
+-- SET PASSWORD FOR openslx@localhost = Password('geheim');
+-- GRANT ALL ON openslx.* TO openslx@localhost;
 
 
 
-- 
cgit v1.2.3-55-g7522


From 8034b1fab2b3e01a392fb712b0c6b48b1a52aeb2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 7 Aug 2014 16:07:07 +0200
Subject: Ignore config.php

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 93b46646..f1c80c99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
 *.tmp
 *.swp
 nbproject/
+/config.php
 
-- 
cgit v1.2.3-55-g7522