1.1 --- a/kanon-setup	Mon Mar 28 03:22:46 2011 +0900
     1.2 +++ b/kanon-setup	Mon Mar 28 04:13:15 2011 +0900
     1.3 @@ -153,40 +153,6 @@
     1.4  
     1.5  
     1.6  ### setup apache and restart
     1.7 -<<<<<<< local
     1.8 -if [ "$OS" = 'debian' ]
     1.9 -then
    1.10 -    cp resource/trac_hook.py /usr/lib/python2.6/dist-packages/bzrlib/plugins
    1.11 -    if [ ! -f /etc/apache2/sites-available/kanon ]
    1.12 -    then
    1.13 -        cp resource/httpd.conf /etc/apache2/sites-available/kanon
    1.14 -    fi
    1.15 -    a2enmod expires
    1.16 -    a2enmod auth_digest
    1.17 -    a2enmod dav_fs
    1.18 -    a2ensite kanon
    1.19 -    service apache2 stop
    1.20 -    service apache2 start
    1.21 -elif [ "$OS" = 'rhel' ]
    1.22 -then
    1.23 -    mkdir -p /usr/lib/python2.6/site-packages/bzrlib/plugin
    1.24 -    cp resource/trac_hook.py /usr/lib/python2.6/site-packages/bzrlib/plugin
    1.25 -    if [ ! -f /etc/httpd/conf.d/kanon.conf ]
    1.26 -    then
    1.27 -        cp resource/httpd.conf /etc/httpd/conf.d/kanon.conf
    1.28 -    fi
    1.29 -    echo 0 > /selinux/enforce
    1.30 -    CHK=`grep SELINUX=enforcing /etc/selinux/config` 
    1.31 -    if [ ! "$CHK" = '' ]   
    1.32 -    then
    1.33 -        cat /etc/selinux/config |sed 's/SELINUX=enforcing/SELINUX=disabled/' > /tmp/selinux_config
    1.34 -        mv /tmp/selinux_config /etc/selinux/config 
    1.35 -    fi
    1.36 -    echo "SELinuxが無効化されました"
    1.37 -    service httpd stop
    1.38 -    service httpd start
    1.39 -fi
    1.40 -=======
    1.41  case $OS in
    1.42      debian)
    1.43          cp resource/trac_hook.py /usr/lib/python2.6/dist-packages/bzrlib/plugins
    1.44 @@ -209,6 +175,12 @@
    1.45              cp resource/httpd.conf /etc/httpd/conf.d/kanon.conf
    1.46          fi
    1.47          echo 0 > /selinux/enforce
    1.48 +        CHK=`grep SELINUX=enforcing /etc/selinux/config` 
    1.49 +        if [ ! "$CHK" = '' ]   
    1.50 +        then
    1.51 +            cat /etc/selinux/config |sed 's/SELINUX=enforcing/SELINUX=disabled/' > /tmp/selinux_config
    1.52 +            mv /tmp/selinux_config /etc/selinux/config 
    1.53 +        fi
    1.54          echo "SELinuxが無効化されました"
    1.55          service httpd stop
    1.56          service httpd start
    1.57 @@ -223,6 +195,12 @@
    1.58              cp resource/httpd.conf /etc/httpd/conf.d/kanon.conf
    1.59          fi
    1.60          echo 0 > /selinux/enforce
    1.61 +        CHK=`grep SELINUX=enforcing /etc/selinux/config` 
    1.62 +        if [ ! "$CHK" = '' ]   
    1.63 +        then
    1.64 +            cat /etc/selinux/config |sed 's/SELINUX=enforcing/SELINUX=disabled/' > /tmp/selinux_config
    1.65 +            mv /tmp/selinux_config /etc/selinux/config 
    1.66 +        fi
    1.67          echo "SELinuxが無効化されました"
    1.68          mv /etc/httpd/conf.d/python.conf /etc/httpd/conf.d/python.conf.disabled
    1.69          service httpd stop
    1.70 @@ -232,7 +210,6 @@
    1.71          ;;
    1.72  esac
    1.73  
    1.74 ->>>>>>> other
    1.75  
    1.76  # データディレクトリが存在しない場合作成
    1.77  if [ ! -d "$KANON_VAR/trac" ]