KanonConductor

changeset 23:03d5ce449e9f

find changesets by author, revision, files, or words in the commit message
merge.
author chris
date Thu, 24 Mar 2011 17:45:43 +0900
parents 83962701c860 5d5ccaa9176f
children 4cb6ee583853
files
diffstat 5 files changed, 14 insertions(+), 0 deletions(-) [+]
line diff
     1.1 Binary file etc/opt/kanon/trac-template/agile/trac-site/htdocs/your_project_logo.png has changed

     2.1 Binary file etc/opt/kanon/trac-template/default/trac-site/htdocs/your_project_logo.png has changed

     3.1 --- a/kanon-setup	Thu Mar 24 17:44:23 2011 +0900
     3.2 +++ b/kanon-setup	Thu Mar 24 17:45:43 2011 +0900
     3.3 @@ -139,6 +139,12 @@
     3.4          cp resource/httpd.conf /etc/httpd/conf.d/kanon.conf
     3.5      fi
     3.6      echo 0 > /selinux/enforce
     3.7 +    CHK=`grep SELINUX=enforcing /etc/selinux/config` 
     3.8 +    if [ ! "$CHK" = '' ]   
     3.9 +    then
    3.10 +        cat /etc/selinux/config |sed 's/SELINUX=enforcing/SELINUX=disabled/' > /tmp/selinux_config
    3.11 +        mv /tmp/selinux_config /etc/selinux/config 
    3.12 +    fi
    3.13      echo "SELinuxが無効化されました"
    3.14      service httpd stop
    3.15      service httpd start
    3.16 @@ -178,5 +184,7 @@
    3.17      chown $APACHE_USER.$APACHE_USER -R /var/opt/kanon/svn/SampleProject
    3.18  fi
    3.19  
    3.20 +chown $APACHE_USER.$APACHE_USER -R /etc/opt/kanon
    3.21 +    
    3.22  echo "Kanon Team Conductorのインストールが完了しました。"
    3.23  echo $KANON_OPT"/bin/kanon-create-project コマンドでプロジェクトを作成してください。"

     4.1 --- a/opt/kanon/lib/cgi-bin/hgweb.wsgi	Thu Mar 24 17:44:23 2011 +0900
     4.2 +++ b/opt/kanon/lib/cgi-bin/hgweb.wsgi	Thu Mar 24 17:45:43 2011 +0900
     4.3 @@ -5,6 +5,9 @@
     4.4  config = "/etc/opt/kanon/hgweb.config"
     4.5  
     4.6  import os
     4.7 +import sys
     4.8 +reload(sys)
     4.9 +sys.setdefaultencoding("utf-8")
    4.10  os.environ["HGENCODING"] = "UTF-8"
    4.11  
    4.12  # Uncomment and adjust if Mercurial is not installed system-wide:

     5.1 --- a/opt/kanon/lib/cgi-bin/trac.wsgi	Thu Mar 24 17:44:23 2011 +0900
     5.2 +++ b/opt/kanon/lib/cgi-bin/trac.wsgi	Thu Mar 24 17:45:43 2011 +0900
     5.3 @@ -15,6 +15,9 @@
     5.4  #
     5.5  # Author: Noah Kantrowitz <noah@coderanger.net>
     5.6  import os
     5.7 +import sys
     5.8 +reload(sys)
     5.9 +sys.setdefaultencoding("utf-8")
    5.10  
    5.11  def application(environ, start_request):
    5.12      if not 'trac.env_parent_dir' in environ: