From 3ba839e033b62fc7477ed3e48a88e7759fa37be3 Mon Sep 17 00:00:00 2001 From: lars-hagen Date: Thu, 9 Jan 2020 00:18:26 +0100 Subject: [PATCH] Changed folder structure, made admin conf persistent and a bin to set password --- conf/httpd_config.conf | 248 ----------------------------- conf/httpd_config.conf.bak | 251 ------------------------------ conf/httpd_config.conf0 | 257 ------------------------------- conf/mime.properties | 162 ------------------- conf/mime.properties0 | 162 ------------------- conf/templates/ccl.conf | 57 ------- conf/templates/ccl.conf.bak | 57 ------- conf/templates/ccl.conf0 | 57 ------- conf/templates/rails.conf | 74 --------- conf/templates/rails.conf0 | 74 --------- conf/vhosts/Example/htgroup | 4 - conf/vhosts/Example/htpasswd | 2 - conf/vhosts/Example/vhconf.conf | 115 -------------- conf/vhosts/Example/vhconf.conf0 | 115 -------------- 14 files changed, 1635 deletions(-) delete mode 100644 conf/httpd_config.conf delete mode 100644 conf/httpd_config.conf.bak delete mode 100644 conf/httpd_config.conf0 delete mode 100755 conf/mime.properties delete mode 100755 conf/mime.properties0 delete mode 100644 conf/templates/ccl.conf delete mode 100644 conf/templates/ccl.conf.bak delete mode 100755 conf/templates/ccl.conf0 delete mode 100755 conf/templates/rails.conf delete mode 100755 conf/templates/rails.conf0 delete mode 100755 conf/vhosts/Example/htgroup delete mode 100755 conf/vhosts/Example/htpasswd delete mode 100644 conf/vhosts/Example/vhconf.conf delete mode 100644 conf/vhosts/Example/vhconf.conf0 diff --git a/conf/httpd_config.conf b/conf/httpd_config.conf deleted file mode 100644 index d9174bf..0000000 --- a/conf/httpd_config.conf +++ /dev/null @@ -1,248 +0,0 @@ -# -# PLAIN TEXT CONFIGURATION FILE -# -#It not set, will use host name as serverName -serverName -user nobody -group nogroup -priority 0 -inMemBufSize 60M -swappingDir /tmp/lshttpd/swap -autoFix503 1 -gracefulRestartTimeout 300 -mime conf/mime.properties -showVersionNumber 0 -adminEmails root@localhost - -errorlog logs/error.log { - logLevel DEBUG - debugLevel 0 - rollingSize 10M - enableStderrLog 1 -} - -accesslog logs/access.log { - rollingSize 10M - keepDays 30 - compressArchive 0 -} -indexFiles index.html, index.php - -expires { - enableExpires 1 - expiresByType image/*=A604800,text/css=A604800,application/x-javascript=A604800,application/javascript=A604800,font/*=A604800,application/x-font-ttf=A604800 -} - -tuning { - maxConnections 10000 - maxSSLConnections 10000 - connTimeout 300 - maxKeepAliveReq 10000 - smartKeepAlive 0 - keepAliveTimeout 5 - sndBufSize 0 - rcvBufSize 0 - maxReqURLLen 32768 - maxReqHeaderSize 65536 - maxReqBodySize 2047M - maxDynRespHeaderSize 32768 - maxDynRespSize 2047M - maxCachedFileSize 4096 - totalInMemCacheSize 20M - maxMMapFileSize 256K - totalMMapCacheSize 40M - useSendfile 1 - fileETag 28 - enableGzipCompress 1 - compressibleTypes text/*, application/x-javascript, application/xml, application/javascript, image/svg+xml,application/rss+xml - enableDynGzipCompress 1 - gzipCompressLevel 6 - gzipAutoUpdateStatic 1 - gzipStaticCompressLevel 6 - brStaticCompressLevel 6 - gzipMaxFileSize 10M - gzipMinFileSize 300 - - quicEnable 1 - quicShmDir /dev/shm -} - -fileAccessControl { - followSymbolLink 1 - checkSymbolLink 0 - requiredPermissionMask 000 - restrictedPermissionMask 000 -} - -perClientConnLimit { - staticReqPerSec 0 - dynReqPerSec 0 - outBandwidth 0 - inBandwidth 0 - softLimit 10000 - hardLimit 10000 - gracePeriod 15 - banPeriod 300 -} - -CGIRLimit { - maxCGIInstances 20 - minUID 11 - minGID 10 - priority 0 - CPUSoftLimit 10 - CPUHardLimit 50 - memSoftLimit 1460M - memHardLimit 1470M - procSoftLimit 400 - procHardLimit 450 -} - -accessDenyDir { - dir / - dir /etc/* - dir /dev/* - dir conf/* - dir admin/conf/* -} - -accessControl { - allow ALL -} - -extprocessor lsphp { - type lsapi - address uds://tmp/lshttpd/lsphp.sock - maxConns 10 - env PHP_LSAPI_CHILDREN=10 - env LSAPI_AVOID_FORK=200M - initTimeout 60 - retryTimeout 0 - persistConn 1 - respBuffer 0 - autoStart 1 - path fcgi-bin/lsphp - backlog 100 - instances 1 - priority 0 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 1400 - procHardLimit 1500 -} - -scripthandler { - add lsapi:lsphp php -} - -railsDefaults { - maxConns 1 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -wsgiDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -nodeDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -module cache { - -checkPrivateCache 1 -checkPublicCache 1 -maxCacheObjSize 10000000 -maxStaleAge 200 -qsCache 1 -reqCookieCache 1 -respCookieCache 1 -ignoreReqCacheCtrl 1 -ignoreRespCacheCtrl 0 - -enableCache 0 -expireInSeconds 3600 -enablePrivateCache 0 -privateExpireInSeconds 3600 - ls_enabled 1 -} - -virtualhost Example { - vhRoot Example/ - configFile conf/vhosts/Example/vhconf.conf - allowSymbolLink 1 - enableScript 1 - restrained 1 - setUIDMode 0 -} - -listener Default { - address *:8088 - secure 0 - map Example * -} - -listener HTTP { - address *:80 - secure 0 -} - -listener HTTPS { - address *:443 - secure 1 - keyFile /usr/local/lsws/admin/conf/webadmin.key - certFile /usr/local/lsws/admin/conf/webadmin.crt -} - -vhTemplate centralConfigLog { - templateFile conf/templates/ccl.conf - listeners Default, HTTP, HTTPS - member localhost { - vhDomain localhost - } -} - -vhTemplate EasyRailsWithSuEXEC { - templateFile conf/templates/rails.conf - listeners Default -} - -#include /usr/local/lsws/conf/sites.conf diff --git a/conf/httpd_config.conf.bak b/conf/httpd_config.conf.bak deleted file mode 100644 index 949488c..0000000 --- a/conf/httpd_config.conf.bak +++ /dev/null @@ -1,251 +0,0 @@ -# -# PLAIN TEXT CONFIGURATION FILE -# -#It not set, will use host name as serverName -serverName -user nobody -group nogroup -priority 0 -inMemBufSize 60M -swappingDir /tmp/lshttpd/swap -autoFix503 1 -gracefulRestartTimeout 300 -mime conf/mime.properties -showVersionNumber 0 -adminEmails root@localhost - -errorlog logs/error.log { - logLevel DEBUG - debugLevel 0 - rollingSize 10M - enableStderrLog 1 -} - -accesslog logs/access.log { - rollingSize 10M - keepDays 30 - compressArchive 0 -} -indexFiles index.html, index.php - -expires { - enableExpires 1 - expiresByType image/*=A604800,text/css=A604800,application/x-javascript=A604800,application/javascript=A604800,font/*=A604800,application/x-font-ttf=A604800 -} - -tuning { - maxConnections 10000 - maxSSLConnections 10000 - connTimeout 300 - maxKeepAliveReq 10000 - smartKeepAlive 0 - keepAliveTimeout 5 - sndBufSize 0 - rcvBufSize 0 - maxReqURLLen 32768 - maxReqHeaderSize 65536 - maxReqBodySize 2047M - maxDynRespHeaderSize 32768 - maxDynRespSize 2047M - maxCachedFileSize 4096 - totalInMemCacheSize 20M - maxMMapFileSize 256K - totalMMapCacheSize 40M - useSendfile 1 - fileETag 28 - enableGzipCompress 1 - compressibleTypes text/*, application/x-javascript, application/xml, application/javascript, image/svg+xml,application/rss+xml - enableDynGzipCompress 1 - gzipCompressLevel 6 - gzipAutoUpdateStatic 1 - gzipStaticCompressLevel 6 - brStaticCompressLevel 6 - gzipMaxFileSize 10M - gzipMinFileSize 300 - - quicEnable 1 - quicShmDir /dev/shm -} - -fileAccessControl { - followSymbolLink 1 - checkSymbolLink 0 - requiredPermissionMask 000 - restrictedPermissionMask 000 -} - -perClientConnLimit { - staticReqPerSec 0 - dynReqPerSec 0 - outBandwidth 0 - inBandwidth 0 - softLimit 10000 - hardLimit 10000 - gracePeriod 15 - banPeriod 300 -} - -CGIRLimit { - maxCGIInstances 20 - minUID 11 - minGID 10 - priority 0 - CPUSoftLimit 10 - CPUHardLimit 50 - memSoftLimit 1460M - memHardLimit 1470M - procSoftLimit 400 - procHardLimit 450 -} - -accessDenyDir { - dir / - dir /etc/* - dir /dev/* - dir conf/* - dir admin/conf/* -} - -accessControl { - allow ALL -} - -extprocessor lsphp { - type lsapi - address uds://tmp/lshttpd/lsphp.sock - maxConns 10 - env PHP_LSAPI_CHILDREN=10 - env LSAPI_AVOID_FORK=200M - initTimeout 60 - retryTimeout 0 - persistConn 1 - respBuffer 0 - autoStart 1 - path fcgi-bin/lsphp - backlog 100 - instances 1 - priority 0 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 1400 - procHardLimit 1500 -} - -scripthandler { - add lsapi:lsphp php -} - -railsDefaults { - maxConns 1 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -wsgiDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -nodeDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -module cache { - -checkPrivateCache 1 -checkPublicCache 1 -maxCacheObjSize 10000000 -maxStaleAge 200 -qsCache 1 -reqCookieCache 1 -respCookieCache 1 -ignoreReqCacheCtrl 1 -ignoreRespCacheCtrl 0 - -enableCache 0 -expireInSeconds 3600 -enablePrivateCache 0 -privateExpireInSeconds 3600 - ls_enabled 1 -} - -virtualhost Example { - vhRoot Example/ - configFile conf/vhosts/Example/vhconf.conf - allowSymbolLink 1 - enableScript 1 - restrained 1 - setUIDMode 0 -} - -listener Default { - address *:8088 - secure 0 - map Example * -} - -listener HTTP { - address *:80 - secure 0 -} - -vhTemplate centralConfigLog { - templateFile conf/templates/ccl.conf - listeners Default, HTTP - note test test - - member example2.com { - vhDomain example2.com - } - - member example6.com { - vhDomain example6.com - } - - member localhost { - vhDomain localhost - } -} - -vhTemplate EasyRailsWithSuEXEC { - templateFile conf/templates/rails.conf - listeners Default -} - -#include /usr/local/lsws/conf/sites.conf diff --git a/conf/httpd_config.conf0 b/conf/httpd_config.conf0 deleted file mode 100644 index 5ed6fb6..0000000 --- a/conf/httpd_config.conf0 +++ /dev/null @@ -1,257 +0,0 @@ -# -# PLAIN TEXT CONFIGURATION FILE -# -#It not set, will use host name as serverName -serverName -user nobody -group nogroup -priority 0 -inMemBufSize 60M -swappingDir /tmp/lshttpd/swap -autoFix503 1 -gracefulRestartTimeout 300 -mime conf/mime.properties -showVersionNumber 0 -adminEmails root@localhost - -errorlog logs/error.log { - logLevel DEBUG - debugLevel 0 - rollingSize 10M - enableStderrLog 1 -} - -accesslog logs/access.log { - rollingSize 10M - keepDays 30 - compressArchive 0 -} -indexFiles index.html, index.php - -expires { - enableExpires 1 - expiresByType image/*=A604800,text/css=A604800,application/x-javascript=A604800,application/javascript=A604800,font/*=A604800,application/x-font-ttf=A604800 -} - -tuning { - maxConnections 10000 - maxSSLConnections 10000 - connTimeout 300 - maxKeepAliveReq 10000 - smartKeepAlive 0 - keepAliveTimeout 5 - sndBufSize 0 - rcvBufSize 0 - maxReqURLLen 32768 - maxReqHeaderSize 65536 - maxReqBodySize 2047M - maxDynRespHeaderSize 32768 - maxDynRespSize 2047M - maxCachedFileSize 4096 - totalInMemCacheSize 20M - maxMMapFileSize 256K - totalMMapCacheSize 40M - useSendfile 1 - fileETag 28 - enableGzipCompress 1 - compressibleTypes text/*, application/x-javascript, application/xml, application/javascript, image/svg+xml,application/rss+xml - enableDynGzipCompress 1 - gzipCompressLevel 6 - gzipAutoUpdateStatic 1 - gzipStaticCompressLevel 6 - brStaticCompressLevel 6 - gzipMaxFileSize 10M - gzipMinFileSize 300 - - quicEnable 1 - quicShmDir /dev/shm -} - -fileAccessControl { - followSymbolLink 1 - checkSymbolLink 0 - requiredPermissionMask 000 - restrictedPermissionMask 000 -} - -perClientConnLimit { - staticReqPerSec 0 - dynReqPerSec 0 - outBandwidth 0 - inBandwidth 0 - softLimit 10000 - hardLimit 10000 - gracePeriod 15 - banPeriod 300 -} - -CGIRLimit { - maxCGIInstances 20 - minUID 11 - minGID 10 - priority 0 - CPUSoftLimit 10 - CPUHardLimit 50 - memSoftLimit 1460M - memHardLimit 1470M - procSoftLimit 400 - procHardLimit 450 -} - -accessDenyDir { - dir / - dir /etc/* - dir /dev/* - dir conf/* - dir admin/conf/* -} - -accessControl { - allow ALL -} - -extprocessor lsphp { - type lsapi - address uds://tmp/lshttpd/lsphp.sock - maxConns 10 - env PHP_LSAPI_CHILDREN=10 - env LSAPI_AVOID_FORK=200M - initTimeout 60 - retryTimeout 0 - persistConn 1 - respBuffer 0 - autoStart 1 - path fcgi-bin/lsphp - backlog 100 - instances 1 - priority 0 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 1400 - procHardLimit 1500 -} - -scripthandler { - add lsapi:lsphp php -} - -railsDefaults { - maxConns 1 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -wsgiDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -nodeDefaults { - maxConns 5 - env LSAPI_MAX_IDLE=60 - initTimeout 60 - retryTimeout 0 - pcKeepAliveTimeout 60 - respBuffer 0 - backlog 50 - runOnStartUp 3 - extMaxIdleTime 300 - priority 3 - memSoftLimit 2047M - memHardLimit 2047M - procSoftLimit 500 - procHardLimit 600 -} - -module cache { - -checkPrivateCache 1 -checkPublicCache 1 -maxCacheObjSize 10000000 -maxStaleAge 200 -qsCache 1 -reqCookieCache 1 -respCookieCache 1 -ignoreReqCacheCtrl 1 -ignoreRespCacheCtrl 0 - -enableCache 0 -expireInSeconds 3600 -enablePrivateCache 0 -privateExpireInSeconds 3600 - ls_enabled 1 -} - -virtualhost Example { - vhRoot Example/ - configFile conf/vhosts/Example/vhconf.conf - allowSymbolLink 1 - enableScript 1 - restrained 1 - setUIDMode 0 -} - -listener Default { - address *:8088 - secure 0 - map Example * -} - -listener HTTP { - address *:80 - secure 0 -} - -vhTemplate centralConfigLog { - templateFile conf/templates/ccl.conf - listeners Default, HTTP - member example4.com { - vhDomain example4.com - } - member example3.com { - vhDomain example3.com - } - note test test - - member example2.com { - vhDomain example2.com - } - - member example6.com { - vhDomain example6.com - } - - member localhost { - vhDomain localhost - } -} - -vhTemplate EasyRailsWithSuEXEC { - templateFile conf/templates/rails.conf - listeners Default -} - -#include /usr/local/lsws/conf/sites.conf diff --git a/conf/mime.properties b/conf/mime.properties deleted file mode 100755 index fa55ee8..0000000 --- a/conf/mime.properties +++ /dev/null @@ -1,162 +0,0 @@ -default = application/octet-stream -3gp = video/3gpp -3g2 = video/3gpp2 -ai, eps = application/postscript -aif, aifc, aiff = audio/x-aiff -asc = text/plain -asf = video/asf -asx = video/x-ms-asf -au = audio/basic -avi = video/x-msvideo -bcpio = application/x-bcpio -bmp = image/bmp -bin = application/octet-stream -bz, bz2 = application/x-bzip -cdf = application/x-netcdf -class = application/java-vm -cpio = application/x-cpio -cpt = application/mac-compactpro -crt = application/x-x509-ca-cert -csh = application/x-csh -css = text/css -dcr,dir, dxr = application/x-director -dms = application/octet-stream -doc = application/msword -dtd = application/xml-dtd -dvi = application/x-dvi -eot = application/vnd.ms-fontobject -etx = text/x-setext -exe = application/x-executable -ez = application/andrew-inset -flv = video/x-flv -gif = image/gif -gtar = application/x-gtar -gz, gzip = application/gzip -hdf = application/x-hdf -hqx = application/mac-binhex40 -htc = text/x-component -html, htm = text/html -ice = x-conference/x-cooltalk -ico = image/x-icon -ief = image/ief -iges, igs = model/iges -iso = application/x-cd-image -java = text/plain -jar = application/java-archive -jnlp = application/x-java-jnlp-file -jpeg, jpe, jpg = image/jpeg -js = application/x-javascript -js2 = application/javascript -js3 = text/javascript -json = application/json -jsp = text/plain -kar = audio/midi -latex = application/x-latex -lha, lzh = application/octet-stream -man = application/x-troff-man -mdb = application/vnd.ms-access -me = application/x-troff-me -mesh = model/mesh -mid, midi = audio/midi -mif = application/vnd.mif -movie = video/x-sgi-movie -mov = video/quicktime -mp2, mp3, mpga = audio/mpeg -mpeg, mpe, mpg = video/mpeg -mp4 = video/mp4 -mpp = application/vnd.ms-project -ms = application/x-troff-ms -msh = model/mesh -nc = application/x-netcdf -oda = application/oda -odb = application/vnd.oasis.opendocument.database -odc = application/vnd.oasis.opendocument.chart -odf = application/vnd.oasis.opendocument.formula -odg = application/vnd.oasis.opendocument.graphics -odi = application/vnd.oasis.opendocument.image -odp = application/vnd.oasis.opendocument.presentation -ods = application/vnd.oasis.opendocument.spreadsheet -odt = application/vnd.oasis.opendocument.text -ogg = audio/ogg -otf = application/x-font-woff -pbm = image/x-portable-bitmap -pdb = chemical/x-pdb -pdf = application/pdf -pgm = image/x-portable-graymap -pgn = application/x-chess-pgn -pls = audio/x-scpls -png = image/png -pnm = image/x-portable-anymap -ppm = image/x-portable-pixmap -ppt = application/vnd.ms-powerpoint -ps = application/postscript -qt,qtvr = video/quicktime -ra = audio/x-realaudio -ram, rm = audio/x-pn-realaudio -rar = application/x-rar-compressed -ras = image/x-cmu-raster -rgb = image/x-rgb -roff, t, tr = application/x-troff -rss = application/rss+xml -rsd = application/rsd+xml -rtf = application/rtf -rtx = text/richtext -ser = application/java-serialized-object -sgml, sgm = text/sgml -sh = application/x-sh -shar = application/x-shar -shtml = application/x-httpd-shtml -silo = model/mesh -sit = application/x-stuffit -skd, skm, skp, skt = application/x-koan -smi,smil = application/smil -snd = audio/basic -spl = application/x-futuresplash -sql = text/x-sql -src = application/x-wais-source -sv4cpio = application/x-sv4cpio -sv4crc = application/x-sv4crc -svg, svgz = image/svg+xml -swf = application/x-shockwave-flash -tar = application/x-tar -tcl = application/x-tcl -tex = application/x-tex -texi, texinfo = application/x-texinfo -tgz = application/x-gtar -tiff, tif = image/tiff -tsv = text/tab-separated-values -ttf, ttc = application/x-font-ttf -txt = text/plain -ustar = application/x-ustar -vcd = application/x-cdlink -vrml = model/vrml -vxml = application/voicexml+xml -wav = audio/vnd.wave -wax = audio/x-ms-wax -wbmp = image/vnd.wap.wbmp -webp = image/webp -wma = audio/x-ms-wma -wml = text/vnd.wap.wml -wmlc = application/vnd.wap.wmlc -wmls = text/vnd.wap.wmlscript -wmlsc = application/vnd.wap.wmlscriptc -woff = application/font-woff -woff2 = font/woff2 -woff3 = font/woff -woff4 = application/font-woff2 -ttf2 = font/ttf -woff_o1 = application/x-font-woff -wtls-ca-certificate = application/vnd.wap.wtls-ca-certificate -wri = application/vnd.ms-write -wrl = model/vrml -xbm = image/x-xbitmap -xhtml, xht = application/xhtml+xml -xls = application/vnd.ms-excel -xml, xsd, xsl = application/xml -xml2 = text/xml -xslt = application/xslt+xml -xpm = image/x-xpixmap -xwd = image/x-xwindowdump -xyz = chemical/x-pdb -zip = application/zip -z = application/compress diff --git a/conf/mime.properties0 b/conf/mime.properties0 deleted file mode 100755 index fa55ee8..0000000 --- a/conf/mime.properties0 +++ /dev/null @@ -1,162 +0,0 @@ -default = application/octet-stream -3gp = video/3gpp -3g2 = video/3gpp2 -ai, eps = application/postscript -aif, aifc, aiff = audio/x-aiff -asc = text/plain -asf = video/asf -asx = video/x-ms-asf -au = audio/basic -avi = video/x-msvideo -bcpio = application/x-bcpio -bmp = image/bmp -bin = application/octet-stream -bz, bz2 = application/x-bzip -cdf = application/x-netcdf -class = application/java-vm -cpio = application/x-cpio -cpt = application/mac-compactpro -crt = application/x-x509-ca-cert -csh = application/x-csh -css = text/css -dcr,dir, dxr = application/x-director -dms = application/octet-stream -doc = application/msword -dtd = application/xml-dtd -dvi = application/x-dvi -eot = application/vnd.ms-fontobject -etx = text/x-setext -exe = application/x-executable -ez = application/andrew-inset -flv = video/x-flv -gif = image/gif -gtar = application/x-gtar -gz, gzip = application/gzip -hdf = application/x-hdf -hqx = application/mac-binhex40 -htc = text/x-component -html, htm = text/html -ice = x-conference/x-cooltalk -ico = image/x-icon -ief = image/ief -iges, igs = model/iges -iso = application/x-cd-image -java = text/plain -jar = application/java-archive -jnlp = application/x-java-jnlp-file -jpeg, jpe, jpg = image/jpeg -js = application/x-javascript -js2 = application/javascript -js3 = text/javascript -json = application/json -jsp = text/plain -kar = audio/midi -latex = application/x-latex -lha, lzh = application/octet-stream -man = application/x-troff-man -mdb = application/vnd.ms-access -me = application/x-troff-me -mesh = model/mesh -mid, midi = audio/midi -mif = application/vnd.mif -movie = video/x-sgi-movie -mov = video/quicktime -mp2, mp3, mpga = audio/mpeg -mpeg, mpe, mpg = video/mpeg -mp4 = video/mp4 -mpp = application/vnd.ms-project -ms = application/x-troff-ms -msh = model/mesh -nc = application/x-netcdf -oda = application/oda -odb = application/vnd.oasis.opendocument.database -odc = application/vnd.oasis.opendocument.chart -odf = application/vnd.oasis.opendocument.formula -odg = application/vnd.oasis.opendocument.graphics -odi = application/vnd.oasis.opendocument.image -odp = application/vnd.oasis.opendocument.presentation -ods = application/vnd.oasis.opendocument.spreadsheet -odt = application/vnd.oasis.opendocument.text -ogg = audio/ogg -otf = application/x-font-woff -pbm = image/x-portable-bitmap -pdb = chemical/x-pdb -pdf = application/pdf -pgm = image/x-portable-graymap -pgn = application/x-chess-pgn -pls = audio/x-scpls -png = image/png -pnm = image/x-portable-anymap -ppm = image/x-portable-pixmap -ppt = application/vnd.ms-powerpoint -ps = application/postscript -qt,qtvr = video/quicktime -ra = audio/x-realaudio -ram, rm = audio/x-pn-realaudio -rar = application/x-rar-compressed -ras = image/x-cmu-raster -rgb = image/x-rgb -roff, t, tr = application/x-troff -rss = application/rss+xml -rsd = application/rsd+xml -rtf = application/rtf -rtx = text/richtext -ser = application/java-serialized-object -sgml, sgm = text/sgml -sh = application/x-sh -shar = application/x-shar -shtml = application/x-httpd-shtml -silo = model/mesh -sit = application/x-stuffit -skd, skm, skp, skt = application/x-koan -smi,smil = application/smil -snd = audio/basic -spl = application/x-futuresplash -sql = text/x-sql -src = application/x-wais-source -sv4cpio = application/x-sv4cpio -sv4crc = application/x-sv4crc -svg, svgz = image/svg+xml -swf = application/x-shockwave-flash -tar = application/x-tar -tcl = application/x-tcl -tex = application/x-tex -texi, texinfo = application/x-texinfo -tgz = application/x-gtar -tiff, tif = image/tiff -tsv = text/tab-separated-values -ttf, ttc = application/x-font-ttf -txt = text/plain -ustar = application/x-ustar -vcd = application/x-cdlink -vrml = model/vrml -vxml = application/voicexml+xml -wav = audio/vnd.wave -wax = audio/x-ms-wax -wbmp = image/vnd.wap.wbmp -webp = image/webp -wma = audio/x-ms-wma -wml = text/vnd.wap.wml -wmlc = application/vnd.wap.wmlc -wmls = text/vnd.wap.wmlscript -wmlsc = application/vnd.wap.wmlscriptc -woff = application/font-woff -woff2 = font/woff2 -woff3 = font/woff -woff4 = application/font-woff2 -ttf2 = font/ttf -woff_o1 = application/x-font-woff -wtls-ca-certificate = application/vnd.wap.wtls-ca-certificate -wri = application/vnd.ms-write -wrl = model/vrml -xbm = image/x-xbitmap -xhtml, xht = application/xhtml+xml -xls = application/vnd.ms-excel -xml, xsd, xsl = application/xml -xml2 = text/xml -xslt = application/xslt+xml -xpm = image/x-xpixmap -xwd = image/x-xwindowdump -xyz = chemical/x-pdb -zip = application/zip -z = application/compress diff --git a/conf/templates/ccl.conf b/conf/templates/ccl.conf deleted file mode 100644 index 3a32386..0000000 --- a/conf/templates/ccl.conf +++ /dev/null @@ -1,57 +0,0 @@ -vhRoot /var/www/vhosts/$VH_NAME/ -configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf -allowSymbolLink 1 -enableScript 1 -restrained 1 -setUIDMode 2 - -virtualHostConfig { - docRoot $VH_ROOT/html/ - enableGzip 1 - - errorlog { - useServer 1 - } - - accesslog $SERVER_ROOT/logs/$VH_NAME.access.log { - useServer 0 - rollingSize 100M - keepDays 30 - compressArchive 1 - } - - index { - useServer 0 - indexFiles index.html, index.php - autoIndex 0 - autoIndexURI /_autoindex/default.php - } - - expires { - enableExpires 1 - } - - accessControl { - allow * - } - - context /cgi-bin/ { - type cgi - location $VH_ROOT/cgi-bin/ - } - - context / { - location $DOC_ROOT/ - allowBrowse 1 - - rewrite { -RewriteFile .htaccess - } - } - - rewrite { - enable 0 - logLevel 0 - } -} - diff --git a/conf/templates/ccl.conf.bak b/conf/templates/ccl.conf.bak deleted file mode 100644 index 07d13b5..0000000 --- a/conf/templates/ccl.conf.bak +++ /dev/null @@ -1,57 +0,0 @@ -vhRoot /var/www/vhosts/$VH_NAME/ -configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf -allowSymbolLink 1 -enableScript 1 -restrained 1 -setUIDMode 0 - -virtualHostConfig { - docRoot $VH_ROOT/html/ - enableGzip 1 - - errorlog { - useServer 1 - } - - accesslog $SERVER_ROOT/logs/$VH_NAME.access.log { - useServer 0 - rollingSize 100M - keepDays 30 - compressArchive 1 - } - - index { - useServer 0 - indexFiles index.html, index.php - autoIndex 0 - autoIndexURI /_autoindex/default.php - } - - expires { - enableExpires 1 - } - - accessControl { - allow * - } - - context /cgi-bin/ { - type cgi - location $VH_ROOT/cgi-bin/ - } - - context / { - location $DOC_ROOT/ - allowBrowse 1 - - rewrite { -RewriteFile .htaccess - } - } - - rewrite { - enable 0 - logLevel 0 - } -} - diff --git a/conf/templates/ccl.conf0 b/conf/templates/ccl.conf0 deleted file mode 100755 index 07d13b5..0000000 --- a/conf/templates/ccl.conf0 +++ /dev/null @@ -1,57 +0,0 @@ -vhRoot /var/www/vhosts/$VH_NAME/ -configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf -allowSymbolLink 1 -enableScript 1 -restrained 1 -setUIDMode 0 - -virtualHostConfig { - docRoot $VH_ROOT/html/ - enableGzip 1 - - errorlog { - useServer 1 - } - - accesslog $SERVER_ROOT/logs/$VH_NAME.access.log { - useServer 0 - rollingSize 100M - keepDays 30 - compressArchive 1 - } - - index { - useServer 0 - indexFiles index.html, index.php - autoIndex 0 - autoIndexURI /_autoindex/default.php - } - - expires { - enableExpires 1 - } - - accessControl { - allow * - } - - context /cgi-bin/ { - type cgi - location $VH_ROOT/cgi-bin/ - } - - context / { - location $DOC_ROOT/ - allowBrowse 1 - - rewrite { -RewriteFile .htaccess - } - } - - rewrite { - enable 0 - logLevel 0 - } -} - diff --git a/conf/templates/rails.conf b/conf/templates/rails.conf deleted file mode 100755 index e6a2fd3..0000000 --- a/conf/templates/rails.conf +++ /dev/null @@ -1,74 +0,0 @@ -allowSymbolLink 1 -chrootMode 0 -enableScript 1 -restrained 1 -setUIDMode 2 -vhRoot $SERVER_ROOT/$VH_NAME/ -configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf - -virtualHostConfig { - enableGzip 1 - docRoot $VH_ROOT/public/ - - accessControl { - allow * - } - - hotlinkCtrl { - suffixes gif, jpeg, jpg - allowDirectAccess 1 - onlySelf 1 - enableHotlinkCtrl 0 - } - - rewrite { - enable 0 - logLevel 0 - } - - index { - useServer 0 - autoIndex 0 - indexFiles index.html - autoIndexURI /_autoindex/default.php - } - - accessLog $SERVER_ROOT/logs/$VH_NAME.access.log{ - logHeaders 3 - compressArchive 0 - useServer 0 - keepDays 30 - rollingSize 500M - } - - errorlog { - useServer 1 - } - - context / { - railsEnv 1 - maxConns 5 - location $VH_ROOT/ - type rails - accessControl - addDefaultCharset off - rewrite { - RewriteFile .htaccess - } - } - - expires { - enableExpires 1 - } - - awstats { - workingDir $VH_ROOT/awstats - awstatsURI /awstats/ - siteDomain localhost - siteAliases 127.0.0.1 localhost - updateMode 0 - updateInterval 86400 - updateOffset 0 - securedConn 0 - } -} diff --git a/conf/templates/rails.conf0 b/conf/templates/rails.conf0 deleted file mode 100755 index e6a2fd3..0000000 --- a/conf/templates/rails.conf0 +++ /dev/null @@ -1,74 +0,0 @@ -allowSymbolLink 1 -chrootMode 0 -enableScript 1 -restrained 1 -setUIDMode 2 -vhRoot $SERVER_ROOT/$VH_NAME/ -configFile $SERVER_ROOT/conf/vhosts/$VH_NAME/vhconf.conf - -virtualHostConfig { - enableGzip 1 - docRoot $VH_ROOT/public/ - - accessControl { - allow * - } - - hotlinkCtrl { - suffixes gif, jpeg, jpg - allowDirectAccess 1 - onlySelf 1 - enableHotlinkCtrl 0 - } - - rewrite { - enable 0 - logLevel 0 - } - - index { - useServer 0 - autoIndex 0 - indexFiles index.html - autoIndexURI /_autoindex/default.php - } - - accessLog $SERVER_ROOT/logs/$VH_NAME.access.log{ - logHeaders 3 - compressArchive 0 - useServer 0 - keepDays 30 - rollingSize 500M - } - - errorlog { - useServer 1 - } - - context / { - railsEnv 1 - maxConns 5 - location $VH_ROOT/ - type rails - accessControl - addDefaultCharset off - rewrite { - RewriteFile .htaccess - } - } - - expires { - enableExpires 1 - } - - awstats { - workingDir $VH_ROOT/awstats - awstatsURI /awstats/ - siteDomain localhost - siteAliases 127.0.0.1 localhost - updateMode 0 - updateInterval 86400 - updateOffset 0 - securedConn 0 - } -} diff --git a/conf/vhosts/Example/htgroup b/conf/vhosts/Example/htgroup deleted file mode 100755 index 5f9c0c8..0000000 --- a/conf/vhosts/Example/htgroup +++ /dev/null @@ -1,4 +0,0 @@ -group1: user1,user2, user3 -group2: -user: user8, test -group3: diff --git a/conf/vhosts/Example/htpasswd b/conf/vhosts/Example/htpasswd deleted file mode 100755 index 2b90853..0000000 --- a/conf/vhosts/Example/htpasswd +++ /dev/null @@ -1,2 +0,0 @@ -test:kF2EDBE2Ux8sQ -user1:SQtevcsBBnBPY diff --git a/conf/vhosts/Example/vhconf.conf b/conf/vhosts/Example/vhconf.conf deleted file mode 100644 index 8baa338..0000000 --- a/conf/vhosts/Example/vhconf.conf +++ /dev/null @@ -1,115 +0,0 @@ -docRoot $VH_ROOT/html/ -enableGzip 1 - - -context / { - allowBrowse 1 - location $DOC_ROOT/ - rewrite { - RewriteFile .htaccess - } -} - -context /docs/{ - allowBrowse 1 - location $SERVER_ROOT/docs/ -} - -context /protected/{ - required user test - authName Protected - allowBrowse 1 - location protected/ - realm SampleProtectedArea - - accessControl { - deny - allow * - } -} - -context /blocked/{ - allowBrowse 0 -} - -context /cgi-bin/{ - allowBrowse 1 - location $VH_ROOT/cgi-bin/ - type cgi -} - -expires { - enableExpires 1 -} - -index { - autoIndexURI /_autoindex/default.php - indexFiles index.html - autoIndex 0 - useServer 0 -} - -errorPage 404{ - url /error404.html -} - -errorlog $VH_ROOT/logs/error.log{ - logLevel DEBUG - rollingSize 10M - useServer 1 -} - -accessLog $VH_ROOT/logs/access.log{ - compressArchive 0 - logReferer 1 - keepDays 30 - rollingSize 10M - logUserAgent 1 - useServer 0 -} - -awstats { - updateInterval 86400 - workingDir $VH_ROOT/awstats - updateOffset 0 - siteDomain localhost - siteAliases 127.0.0.1 localhost - updateMode 0 - awstatsURI /awstats/ -} - -rewrite { - enable 0 - logLevel 0 -} - -hotlinkCtrl { - suffixes gif, jpeg, jpg - allowedHosts - allowDirectAccess 1 - enableHotlinkCtrl 0 - onlySelf 1 -} - -accessControl { - deny - allow * -} - -realm SampleProtectedArea { - userDB { - cacheTimeout 60 - maxCacheSize 200 - location conf/vhosts/Example/htpasswd - } - - groupDB { - cacheTimeout 60 - maxCacheSize 200 - location conf/vhosts/Example/htgroup - } -} - -general { - enableContextAC 0 -} diff --git a/conf/vhosts/Example/vhconf.conf0 b/conf/vhosts/Example/vhconf.conf0 deleted file mode 100644 index 8baa338..0000000 --- a/conf/vhosts/Example/vhconf.conf0 +++ /dev/null @@ -1,115 +0,0 @@ -docRoot $VH_ROOT/html/ -enableGzip 1 - - -context / { - allowBrowse 1 - location $DOC_ROOT/ - rewrite { - RewriteFile .htaccess - } -} - -context /docs/{ - allowBrowse 1 - location $SERVER_ROOT/docs/ -} - -context /protected/{ - required user test - authName Protected - allowBrowse 1 - location protected/ - realm SampleProtectedArea - - accessControl { - deny - allow * - } -} - -context /blocked/{ - allowBrowse 0 -} - -context /cgi-bin/{ - allowBrowse 1 - location $VH_ROOT/cgi-bin/ - type cgi -} - -expires { - enableExpires 1 -} - -index { - autoIndexURI /_autoindex/default.php - indexFiles index.html - autoIndex 0 - useServer 0 -} - -errorPage 404{ - url /error404.html -} - -errorlog $VH_ROOT/logs/error.log{ - logLevel DEBUG - rollingSize 10M - useServer 1 -} - -accessLog $VH_ROOT/logs/access.log{ - compressArchive 0 - logReferer 1 - keepDays 30 - rollingSize 10M - logUserAgent 1 - useServer 0 -} - -awstats { - updateInterval 86400 - workingDir $VH_ROOT/awstats - updateOffset 0 - siteDomain localhost - siteAliases 127.0.0.1 localhost - updateMode 0 - awstatsURI /awstats/ -} - -rewrite { - enable 0 - logLevel 0 -} - -hotlinkCtrl { - suffixes gif, jpeg, jpg - allowedHosts - allowDirectAccess 1 - enableHotlinkCtrl 0 - onlySelf 1 -} - -accessControl { - deny - allow * -} - -realm SampleProtectedArea { - userDB { - cacheTimeout 60 - maxCacheSize 200 - location conf/vhosts/Example/htpasswd - } - - groupDB { - cacheTimeout 60 - maxCacheSize 200 - location conf/vhosts/Example/htgroup - } -} - -general { - enableContextAC 0 -}