From c1a633ddeede7fd2de1b1a186edcbb4222ed51ec Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 10 Aug 2013 16:28:05 +0100 Subject: Missing include for new_keypair --- include/account.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/account.php b/include/account.php index 6dfb5ae1e..ab442ab39 100644 --- a/include/account.php +++ b/include/account.php @@ -6,6 +6,7 @@ require_once('include/plugin.php'); require_once('include/text.php'); require_once('include/language.php'); require_once('include/datetime.php'); +require_once('include/crypto.php'); function check_account_email($email) { -- cgit v1.2.3 From 9f2b651491c464f783420a99b4a83fde63e0d044 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 11 Aug 2013 00:21:56 +0100 Subject: How did that end up there? Move sample config to right place. --- doc/install/sample-lighttpd.conf | 85 ++++++++++++++++++++++++++++++++++++++++ sample-lighttpd.conf | 85 ---------------------------------------- 2 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 doc/install/sample-lighttpd.conf delete mode 100644 sample-lighttpd.conf diff --git a/doc/install/sample-lighttpd.conf b/doc/install/sample-lighttpd.conf new file mode 100644 index 000000000..213719ac9 --- /dev/null +++ b/doc/install/sample-lighttpd.conf @@ -0,0 +1,85 @@ +# See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions + +### LOAD MODULES +server.modules = ( + "mod_access", + "mod_accesslog", + "mod_fastcgi", + "mod_redirect", + "mod_rewrite" +) + +### BASIC STUFF +server.port = 80 + +server.username = "http" + +server.groupname = "http" + +server.document-root = "/path/to/your/www/files" #adjust to your setup + +server.errorlog = "/var/log/lighttpd/error.log" + +accesslog.filename = "/var/log/lighttpd/access.log" + +### DISABLE DIR LISTING +dir-listing.activate = "disable" + +### DISABLE REJECT EXPECT HEADER +### (needed for curl POST requests - otherwise they fail with error 417) +server.reject-expect-100-with-417 = "disable" + +### DEFINE SUPPORTED INDEX FILENAMES +index-file.names = ( + "index.html", + "index.htm", + "index.php" +) + +### DEFINE SUPPORTED MIME TYPES +mimetype.assign = ( + ".html" => "text/html", + ".htm" => "text/html", + ".css" => "text/css", + ".txt" => "text/plain", + ".svg" => "image/svg+xml", + ".jpg" => "image/jpeg", + ".png" => "image/png" +) + +### DONT EVER SERVE FILES WITH EXTENSION +static-file.exclude-extensions = ( ".php" ) + +### PHP WITH PHP-FPM +### (needs php-fpm installed and running) +fastcgi.server = ( + ".php" => ( + "localhost" => ( + "socket" => "/run/php-fpm/php-fpm.sock", + "broken-scriptfilename" => "enable", + "allow-x-sendfile" => "enable" + ) + ) +) + +### ENABLE SSL +$SERVER["socket"] == ":443" { + ssl.engine = "enable" + ssl.ca-file = "/etc/lighttpd/certs/ca-certs.crt" #adjust to your needs + ssl.pemfile = "/etc/lighttpd/certs/red-ssl.crt" #adjust to your needs +} + +### RISTRICT ACCESS TO DIRECTORYS AND FILES +$HTTP["url"] =~ "\.(out|log|htaccess)$" { + url.access-deny = ("") +} + +$HTTP["url"] =~ "(^|/)\.git" { + url.access-deny = ("") +} + +### URL REWRITE RULES +url.rewrite-if-not-file = ( + "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", + "^\/(.*)$" => "/index.php?q=$1" +) diff --git a/sample-lighttpd.conf b/sample-lighttpd.conf deleted file mode 100644 index 213719ac9..000000000 --- a/sample-lighttpd.conf +++ /dev/null @@ -1,85 +0,0 @@ -# See http://redmine.lighttpd.net/projects/lighttpd/wiki/Docs:ConfigurationOptions - -### LOAD MODULES -server.modules = ( - "mod_access", - "mod_accesslog", - "mod_fastcgi", - "mod_redirect", - "mod_rewrite" -) - -### BASIC STUFF -server.port = 80 - -server.username = "http" - -server.groupname = "http" - -server.document-root = "/path/to/your/www/files" #adjust to your setup - -server.errorlog = "/var/log/lighttpd/error.log" - -accesslog.filename = "/var/log/lighttpd/access.log" - -### DISABLE DIR LISTING -dir-listing.activate = "disable" - -### DISABLE REJECT EXPECT HEADER -### (needed for curl POST requests - otherwise they fail with error 417) -server.reject-expect-100-with-417 = "disable" - -### DEFINE SUPPORTED INDEX FILENAMES -index-file.names = ( - "index.html", - "index.htm", - "index.php" -) - -### DEFINE SUPPORTED MIME TYPES -mimetype.assign = ( - ".html" => "text/html", - ".htm" => "text/html", - ".css" => "text/css", - ".txt" => "text/plain", - ".svg" => "image/svg+xml", - ".jpg" => "image/jpeg", - ".png" => "image/png" -) - -### DONT EVER SERVE FILES WITH EXTENSION -static-file.exclude-extensions = ( ".php" ) - -### PHP WITH PHP-FPM -### (needs php-fpm installed and running) -fastcgi.server = ( - ".php" => ( - "localhost" => ( - "socket" => "/run/php-fpm/php-fpm.sock", - "broken-scriptfilename" => "enable", - "allow-x-sendfile" => "enable" - ) - ) -) - -### ENABLE SSL -$SERVER["socket"] == ":443" { - ssl.engine = "enable" - ssl.ca-file = "/etc/lighttpd/certs/ca-certs.crt" #adjust to your needs - ssl.pemfile = "/etc/lighttpd/certs/red-ssl.crt" #adjust to your needs -} - -### RISTRICT ACCESS TO DIRECTORYS AND FILES -$HTTP["url"] =~ "\.(out|log|htaccess)$" { - url.access-deny = ("") -} - -$HTTP["url"] =~ "(^|/)\.git" { - url.access-deny = ("") -} - -### URL REWRITE RULES -url.rewrite-if-not-file = ( - "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", - "^\/(.*)$" => "/index.php?q=$1" -) -- cgit v1.2.3 From 94e589fee8fef5bc7937059c459564902a725c75 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr." Date: Sun, 11 Aug 2013 08:17:42 -0300 Subject: Update install.txt - fix shell command and path instruction - Fix chown with chmod - Fix path from view/smarty3 to view/tpl/smarty3 --- install.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.txt b/install.txt index ecd0b190d..b25f22133 100644 --- a/install.txt +++ b/install.txt @@ -47,7 +47,7 @@ you might have trouble getting everything to work.] `mkdir view/tpl/smarty3` - `chown 777 view/smarty3` + `chmod 777 view/tpl/smarty3` - For installing addons -- cgit v1.2.3