From 139c70322c35f10d8d73d3cc94bec673bff52721 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 7 Jul 2018 20:45:42 +0200 Subject: [PATCH] Fixing upstream bug #5. --- doraemon.spec | 5 +- root/etc/httpd/doraemon/httpd.conf | 162 +++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 root/etc/httpd/doraemon/httpd.conf diff --git a/doraemon.spec b/doraemon.spec index bdfdb72..a790267 100644 --- a/doraemon.spec +++ b/doraemon.spec @@ -1,6 +1,6 @@ Summary: Helps client to join domain and maintain itself Name: doraemon -Version: 2.0.3 +Version: 2.0.4 Release: 1.ns6 URL: https://github.com/bglug-it/doraemon/ License: GPLv2+ @@ -145,6 +145,9 @@ rm -rf %{buildroot} %changelog +* Sun Jun 17 2018 Emiliano Vavassori - 2.0.4-1 +- FIX: Doraemon doesn't start after installation + * Sun Jun 17 2018 Emiliano Vavassori - 2.0.3-1 - FIX: whatsmyhostname correctly parse role variable - Minor aesthetic syntax fixes diff --git a/root/etc/httpd/doraemon/httpd.conf b/root/etc/httpd/doraemon/httpd.conf new file mode 100644 index 0000000..6162f72 --- /dev/null +++ b/root/etc/httpd/doraemon/httpd.conf @@ -0,0 +1,162 @@ +# ================= DO NOT MODIFY THIS FILE ================= +# +# Manual changes will be lost when this file is regenerated. +# +# Please read the developer's guide, which is available +# at https://dev.nethesis.it/projects/nethserver/wiki/NethServer +# original work from http://www.contribs.org/development/ +# +# Copyright (C) 2013 Nethesis S.r.l. +# http://www.nethesis.it - support@nethesis.it +# +Listen 3000 +HostnameLookups off + +ServerAdmin root +ServerRoot /etc/httpd +ServerTokens ProductOnly + +User srvmgr +Group srvmgr + +ErrorLog /var/log/doraemon/error_log +LogLevel warn +LoadModule env_module modules/mod_env.so +LoadModule log_config_module modules/mod_log_config.so +LoadModule mime_module modules/mod_mime.so +LoadModule negotiation_module modules/mod_negotiation.so +LoadModule include_module modules/mod_include.so +LoadModule autoindex_module modules/mod_autoindex.so +LoadModule dir_module modules/mod_dir.so +LoadModule alias_module modules/mod_alias.so +LoadModule rewrite_module modules/mod_rewrite.so +LoadModule authz_host_module modules/mod_authz_host.so +LoadModule expires_module modules/mod_expires.so +LoadModule headers_module modules/mod_headers.so +LoadModule setenvif_module modules/mod_setenvif.so +LoadModule ssl_module modules/mod_ssl.so +PidFile /var/run/doraemon.pid +ScoreBoardFile /var/run/doraemon.scoreboard +UseCanonicalName off +LogFormat "%h %l %u %t \"%r\" %>s %b" common +LogFormat "%{User-agent}i" agent + +CustomLog /var/log/doraemon/access_log common + +KeepAlive On +MaxKeepAliveRequests 100 +KeepAliveTimeout 15 + +MaxClients 150 +MaxRequestsPerChild 100 + +MinSpareServers 1 +MaxSpareServers 5 +StartServers 1 +Timeout 300 + +DefaultIcon /icons/unknown.gif +DirectoryIndex index.htm index.html index.shtml index.cgi +IndexOptions FancyIndexing VersionSort NameWidth=* +IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t +AccessFileName .htaccess + +AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip +AddIconByType (TXT,/icons/text.gif) text/* +AddIconByType (IMG,/icons/image2.gif) image/* +AddIconByType (SND,/icons/sound2.gif) audio/* +AddIconByType (VID,/icons/movie.gif) video/* +DefaultType text/plain +TypesConfig /etc/mime.types + +AddEncoding x-compress Z +AddEncoding x-gzip gz + +AddIcon /icons/binary.gif .bin .exe +AddIcon /icons/binhex.gif .hqx +AddIcon /icons/tar.gif .tar +AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv +AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip +AddIcon /icons/a.gif .ps .ai .eps +AddIcon /icons/layout.gif .html .shtml .htm .pdf +AddIcon /icons/text.gif .txt +AddIcon /icons/c.gif .c +AddIcon /icons/p.gif .pl .py +AddIcon /icons/f.gif .for +AddIcon /icons/dvi.gif .dvi +AddIcon /icons/uuencoded.gif .uu +AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl +AddIcon /icons/tex.gif .tex +AddIcon /icons/bomb.gif core + +AddIcon /icons/back.gif .. +AddIcon /icons/hand.right.gif README +AddIcon /icons/folder.gif ^^DIRECTORY^^ +AddIcon /icons/blank.gif ^^BLANKICON^^ + +AddLanguage en .en +AddLanguage fr .fr +AddLanguage de .de +AddLanguage da .da +AddLanguage el .el +AddLanguage it .it + +LanguagePriority en it de fr + +AddType text/html .shtml +AddType application/x-pkcs7-crl .crl + +AddType application/x-x509-ca-cert .crt + +BrowserMatch "Mozilla/2" nokeepalive +BrowserMatch "MSIE 4.0b2;" nokeepalive downgrade-1.0 force-response-1.0 +BrowserMatch "RealPlayer 4.0" force-response-1.0 +BrowserMatch "Java/1.0" force-response-1.0 +BrowserMatch "JDK/1.0" force-response-1.0 + +AddHandler cgi-script .cgi +AddHandler server-parsed .shtml +AddHandler imap-file map + + + + +# First, we configure the "default" to be a very restrictive set of +# permissions. + + + Options None + AllowOverride None + order deny,allow + deny from all + allow from none + + + + Allow from all + + + +DocumentRoot /usr/share/doraemon +Alias /icons/ /var/www/icons/ + + + Options +Indexes + Order Deny,Allow + Deny from all + Allow from all + AddType application/x-httpd-php .php + Options +FollowSymlinks + RewriteEngine on + RewriteBase / + RewriteRule ^(js/|fonts/|css/|images/|icons/|.+\.php) - [PT,L] + RewriteRule ^favicon.ico$ images/favicon.ico [L] + RewriteRule ^(.*)$ index.php/$1 [L] + php_value session.save_path /var/cache/doraemon + php_flag magic_quotes_gpc off + + + + + +Include conf.d/php.conf