| 1 |
picsone |
1.1 |
--- smeserver-sitemaker-2.0.1/root/usr/local/bin/smesm.FixCGIandHttpdSettingsPlusWarn 2007-12-06 12:41:18.000000000 -0200 |
| 2 |
|
|
+++ smeserver-sitemaker-2.0.1/root/usr/local/bin/smesm 2008-06-29 03:28:50.000000000 -0300 |
| 3 |
|
|
@@ -4,13 +4,24 @@ |
| 4 |
|
|
# nhall@unixlan.com.ar |
| 5 |
|
|
# |
| 6 |
|
|
# Status |
| 7 |
|
|
-# Version: 2.0 |
| 8 |
|
|
+# Version: 2.2 |
| 9 |
|
|
# 20/10/2007 (d/m/Y) |
| 10 |
|
|
# |
| 11 |
|
|
# |
| 12 |
|
|
# Changelog |
| 13 |
|
|
# |
| 14 |
|
|
-# 2.0 (reloaded) (by Normando Hall) |
| 15 |
|
|
+# 2.2 (by Normando Hall) |
| 16 |
|
|
+# Fix f_fop f_rgl flags and their settings |
| 17 |
|
|
+# Fix SSLRequireSSL directive |
| 18 |
|
|
+# Change for cgi. If you specify a directory |
| 19 |
|
|
+# then create under root dir, and set with ScripAlias |
| 20 |
|
|
+# directive. If not, we assume you can use the root dir |
| 21 |
|
|
+# to execute cgi scripts, so we avoid the use of ScriptAlias |
| 22 |
|
|
+# and use the Options +ExecCGI directive plus |
| 23 |
|
|
+# AddHandler cgi-script .cgi .pl |
| 24 |
|
|
+# Added a warning about white spaces in names and diretories. |
| 25 |
|
|
+# |
| 26 |
|
|
+# 2.1 (reloaded) (by Normando Hall) |
| 27 |
|
|
# Remove SME6 compatibility |
| 28 |
|
|
# Fix root dir perms |
| 29 |
|
|
# Improve instructions and visual |
| 30 |
|
|
@@ -68,6 +79,8 @@ |
| 31 |
|
|
echo "| With SMESiteMaker, you only have to answer the questions in |" |
| 32 |
|
|
echo "| the wizard. |" |
| 33 |
|
|
echo "| |" |
| 34 |
|
|
+echo "| WARNING: Never use white spaces in names or directories! |" |
| 35 |
|
|
+echo "| |" |
| 36 |
|
|
echo "| If you feel confortable with the above then press enter, if |" |
| 37 |
|
|
echo "| not press Ctrl+C to abort the configuration script. |" |
| 38 |
|
|
echo "| |" |
| 39 |
|
|
@@ -357,7 +370,7 @@ |
| 40 |
|
|
if [ "$cgi_root" != "" ] |
| 41 |
|
|
then |
| 42 |
|
|
c_root=$f_root/$cgi_root |
| 43 |
|
|
- |
| 44 |
|
|
+f_cgisamedir="0" |
| 45 |
|
|
if [ -d $c_root ] |
| 46 |
|
|
then |
| 47 |
|
|
|
| 48 |
|
|
@@ -392,10 +405,12 @@ |
| 49 |
|
|
c_root=$f_root |
| 50 |
|
|
chown root.www $c_root |
| 51 |
|
|
chmod 755 $c_root |
| 52 |
|
|
- |
| 53 |
|
|
+f_cgisamedir="1" |
| 54 |
|
|
fi |
| 55 |
|
|
|
| 56 |
|
|
###################### - CGI ALIAS -######################################### |
| 57 |
|
|
+if [ "$f_cgisamedir" == "0" ] |
| 58 |
|
|
+then |
| 59 |
|
|
ANSWER=1 |
| 60 |
|
|
while [ $ANSWER = 1 ] |
| 61 |
|
|
do |
| 62 |
|
|
@@ -422,6 +437,7 @@ |
| 63 |
|
|
done |
| 64 |
|
|
|
| 65 |
|
|
fi |
| 66 |
|
|
+fi |
| 67 |
|
|
################################ - MySQL - #######################################3 |
| 68 |
|
|
query_file="/tmp/SMESM_query" |
| 69 |
|
|
clear |
| 70 |
|
|
@@ -665,21 +681,14 @@ |
| 71 |
|
|
fi |
| 72 |
|
|
fopt="" |
| 73 |
|
|
touch $c_file |
| 74 |
|
|
-if [ "$f_cgi" == "1" ] |
| 75 |
|
|
+if [ "$f_cgi" == "1" ]&&[ "$f_cgisamedir" == "0" ] |
| 76 |
|
|
then |
| 77 |
|
|
echo "ScriptAlias $a_root$ca_root $c_root" > $c_file |
| 78 |
|
|
fi |
| 79 |
|
|
echo "Alias $a_root $f_root" >> $c_file |
| 80 |
|
|
echo "<Directory $f_root>" >> $c_file |
| 81 |
|
|
-if [ "$f_ssl" == "1" ] |
| 82 |
|
|
-then |
| 83 |
|
|
-echo 'SSLRequireSSL on' >> $c_file |
| 84 |
|
|
-fi |
| 85 |
|
|
-if [ "$f_php" == "1" ] |
| 86 |
|
|
-then |
| 87 |
|
|
-echo 'AddType application/x-httpd-php .php .php3 .phtml' >> $c_file |
| 88 |
|
|
-fi |
| 89 |
|
|
-if [ "$f_idx" == "1" ]||[ "$f_aov" == "1" ] |
| 90 |
|
|
+ |
| 91 |
|
|
+if [ "$f_idx" == "1" ]||[ "$f_aov" == "1" ]||[ "$f_cgisamedir" == "1" ] |
| 92 |
|
|
then |
| 93 |
|
|
fopt="Options " |
| 94 |
|
|
if [ "$f_idx" == "1" ] |
| 95 |
|
|
@@ -690,12 +699,35 @@ |
| 96 |
|
|
then |
| 97 |
|
|
fopt="$fopt FollowSymLinks " |
| 98 |
|
|
fi |
| 99 |
|
|
+if [ "$f_cgi" == "1" ]&&[ "$f_cgisamedir" == "1" ] |
| 100 |
|
|
+then |
| 101 |
|
|
+fopt="$fopt +ExecCGI " |
| 102 |
|
|
+fi |
| 103 |
|
|
echo "$fopt" >> $c_file |
| 104 |
|
|
-if [ "$f_aov" == "1" ] |
| 105 |
|
|
+fi |
| 106 |
|
|
+ |
| 107 |
|
|
+if [ "$f_ssl" == "1" ] |
| 108 |
|
|
then |
| 109 |
|
|
-echo 'AllowOverride all' >> $c_file |
| 110 |
|
|
+echo 'SSLRequireSSL' >> $c_file |
| 111 |
|
|
fi |
| 112 |
|
|
+ |
| 113 |
|
|
+if [ "$f_php" == "1" ] |
| 114 |
|
|
+then |
| 115 |
|
|
+echo 'AddType application/x-httpd-php .php .php3 .phtml' >> $c_file |
| 116 |
|
|
fi |
| 117 |
|
|
+ |
| 118 |
|
|
+if [ "$f_cgi" == "1" ]&&[ "$f_cgisamedir" == "1" ] |
| 119 |
|
|
+then |
| 120 |
|
|
+echo 'AddHandler cgi-script .cgi .pl' >> $c_file |
| 121 |
|
|
+fi |
| 122 |
|
|
+ |
| 123 |
|
|
+if [ "$f_aov" == "1" ] |
| 124 |
|
|
+then |
| 125 |
|
|
+echo 'AllowOverride All' >> $c_file |
| 126 |
|
|
+else |
| 127 |
|
|
+echo 'AllowOverride None' >> $c_file |
| 128 |
|
|
+fi |
| 129 |
|
|
+ |
| 130 |
|
|
echo 'order deny,allow' >> $c_file |
| 131 |
|
|
echo 'deny from all' >> $c_file |
| 132 |
|
|
echo 'allow from all' >> $c_file |
| 133 |
|
|
@@ -704,21 +736,23 @@ |
| 134 |
|
|
|
| 135 |
|
|
if [ "$f_fop" == "1" ] |
| 136 |
|
|
then |
| 137 |
|
|
-echo 'php_flag register_globals on' >> $c_file |
| 138 |
|
|
+echo 'php_flag allow_url_fopen on' >> $c_file |
| 139 |
|
|
else |
| 140 |
|
|
-echo 'php_flag register_globals off' >> $c_file |
| 141 |
|
|
+echo 'php_flag allow_url_fopen off' >> $c_file |
| 142 |
|
|
fi |
| 143 |
|
|
|
| 144 |
|
|
if [ "$f_rgl" == "1" ] |
| 145 |
|
|
then |
| 146 |
|
|
-echo 'php_admin_flag allow_url_fopen on' >> $c_file |
| 147 |
|
|
+echo 'php_admin_flag register_globals on' >> $c_file |
| 148 |
|
|
else |
| 149 |
|
|
-echo 'php_admin_flag allow_url_fopen off' >> $c_file |
| 150 |
|
|
+echo 'php_admin_flag register_globals off' >> $c_file |
| 151 |
|
|
fi |
| 152 |
|
|
|
| 153 |
|
|
if [ "$f_eac" == "1" ] |
| 154 |
|
|
then |
| 155 |
|
|
echo 'php_admin_value eaccelerator.enable 1' >> $c_file |
| 156 |
|
|
+else |
| 157 |
|
|
+echo 'php_admin_value eaccelerator.enable 0' >> $c_file |
| 158 |
|
|
fi |
| 159 |
|
|
|
| 160 |
|
|
echo "php_admin_value open_basedir $open_bd" >> $c_file |
Parent Directory
| 
Revision Log
| 
Revision Graph
