Moved sample configuration files to newly sample directory.

karesansui · Apr 12, 2012 · 5ec2772 · 5ec2772
1 parent d3825c6
commit 5ec2772
Show file tree

Hide file tree

Showing 102 changed files with 39 additions and 530 deletions.
diff --git a/INSTALL.ja.md b/INSTALL.ja.md
@@ -163,23 +163,23 @@ RPMパッケージを作成する環境を構築します。パッケージ作
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://webpy.org/static/web.py-0.36.tar.gz
-    $ rpmbuild -ba ~/karesansui/doc/specs/python-webpy/python-webpy.spec
+    $ rpmbuild -ba ~/karesansui/sample/specs/python-webpy/python-webpy.spec
 
 ######4. IPAexfontパッケージの作成
 
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://iij.dl.sourceforge.jp/ipafonts/49986/IPAexfont00103.zip
-    $ cp ~rpmbuild/karesansui/doc/specs/IPAexfont/09-ipaexfont.conf .
-    $ rpmbuild -ba ~/karesansui/doc/specs/IPAexfont/IPAexfont.spec 
+    $ cp ~rpmbuild/karesansui/sample/specs/IPAexfont/09-ipaexfont.conf .
+    $ rpmbuild -ba ~/karesansui/sample/specs/IPAexfont/IPAexfont.spec 
 
 ######5. tightvnc-javaパッケージの作成
 
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://downloads.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.3.10_javabin.tar.gz
     $ wget http://downloads.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz
-    $ rpmbuild -ba ~/karesansui/doc/specs/tightvnc-java/tightvnc-java.spec 
+    $ rpmbuild -ba ~/karesansui/sample/specs/tightvnc-java/tightvnc-java.spec 
 
 ######6. ビルドしたパッケージのインストール
 
@@ -281,13 +281,13 @@ Karesansuiと同じく、Karesansui Project Teamによって開発されたソ
     # find /usr/share/karesansui/ -type d -exec chmod g+rwx \{\} \;
 
     #### Copy several programs, configuration files and SysV init script ####
-    # cp -f  ~rpmbuild/karesansui/doc/application.conf.example /etc/karesansui/application.conf
-    # cp -f  ~rpmbuild/karesansui/doc/log.conf.example /etc/karesansui/log.conf
-    # cp -f  ~rpmbuild/karesansui/doc/service.xml.example /etc/karesansui/service.xml
-    # cp -f  ~rpmbuild/karesansui/doc/logview.xml.example /etc/karesansui/logview.xml
-    # cp -fr ~rpmbuild/karesansui/doc/template/ /etc/karesansui/template/
-    # cp -f  ~rpmbuild/karesansui/doc/cron_cleantmp.example /etc/cron.d/karesansui_cleantmp
-    # cp -f  ~rpmbuild/karesansui/doc/whitelist.conf.example /etc/pysilhouette/whitelist.conf
+    # cp -f  ~rpmbuild/karesansui/sample/application.conf.example /etc/karesansui/application.conf
+    # cp -f  ~rpmbuild/karesansui/sample/log.conf.example /etc/karesansui/log.conf
+    # cp -f  ~rpmbuild/karesansui/sample/service.xml.example /etc/karesansui/service.xml
+    # cp -f  ~rpmbuild/karesansui/sample/logview.xml.example /etc/karesansui/logview.xml
+    # cp -fr ~rpmbuild/karesansui/sample/template/ /etc/karesansui/template/
+    # cp -f  ~rpmbuild/karesansui/sample/cron_cleantmp.example /etc/cron.d/karesansui_cleantmp
+    # cp -f  ~rpmbuild/karesansui/sample/whitelist.conf.example /etc/pysilhouette/whitelist.conf
 
 
 ## pysilhouetteの設定 ##
@@ -512,7 +512,7 @@ _/etc/lighttpd/modules.conf_ で以下のモジュールを有効にします。
 
 ソースコードに付属する設定ファイルのサンプルをコピーし、必要であれば設定内容を変更します。
 
-    # cp ~rpmbuild/karesansui/doc/lighttpd/karesansui.conf /etc/lighttpd/conf.d/
+    # cp ~rpmbuild/karesansui/sample/lighttpd/karesansui.conf /etc/lighttpd/conf.d/
 
 
 ####4. lighttpdのSSLの設定
@@ -574,7 +574,7 @@ _apache_ ユーザーを _kss_ グループに、 _kss_ ユーザーを _apache_
 
 ソースコードに付属する設定ファイルのサンプルをコピーし、必要であれば設定内容を変更します。
 
-    # cp ~rpmbuild/karesansui/doc/apache/fastcgi.conf /etc/httpd/conf.d/
+    # cp ~rpmbuild/karesansui/sample/apache/fastcgi.conf /etc/httpd/conf.d/
 
 ####4. Webサーバーの起動
 
@@ -632,7 +632,7 @@ _nginx_ ユーザーを _kss_ グループに、 _kss_ ユーザーを _nginx_
 
 ソースコードに付属する設定ファイルのサンプルをコピーし、必要であれば設定内容を変更します。
 
-    # cp ~rpmbuild/karesansui/doc/nginx/karesansui.conf /etc/nginx/conf.d/
+    # cp ~rpmbuild/karesansui/sample/nginx/karesansui.conf /etc/nginx/conf.d/
 
 ####4. Webサーバーの起動
 

diff --git a/INSTALL.md b/INSTALL.md
@@ -165,23 +165,23 @@ Create a seperate account for building RPMs and set up the environment for it:
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://webpy.org/static/web.py-0.36.tar.gz
-    $ rpmbuild -ba ~/karesansui/doc/specs/python-webpy/python-webpy.spec
+    $ rpmbuild -ba ~/karesansui/sample/specs/python-webpy/python-webpy.spec
 
 ######Step 4. Building IPAexfont package.
 
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://iij.dl.sourceforge.jp/ipafonts/49986/IPAexfont00103.zip
-    $ cp ~rpmbuild/karesansui/doc/specs/IPAexfont/09-ipaexfont.conf .
-    $ rpmbuild -ba ~/karesansui/doc/specs/IPAexfont/IPAexfont.spec 
+    $ cp ~rpmbuild/karesansui/sample/specs/IPAexfont/09-ipaexfont.conf .
+    $ rpmbuild -ba ~/karesansui/sample/specs/IPAexfont/IPAexfont.spec 
 
 ######Step 5. Building tightvnc-java package.
 
     # su - rpmbuild
     $ cd ~/pkgs/SOURCES/
     $ wget http://downloads.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.3.10_javabin.tar.gz
     $ wget http://downloads.sourceforge.net/sourceforge/vnc-tight/tightvnc-1.3.10_javasrc.tar.gz
-    $ rpmbuild -ba ~/karesansui/doc/specs/tightvnc-java/tightvnc-java.spec 
+    $ rpmbuild -ba ~/karesansui/sample/specs/tightvnc-java/tightvnc-java.spec 
 
 ######Step 6. Installing the built packages.
 
@@ -290,13 +290,13 @@ It is also developed by Karesansui Project Team.
     # find /usr/share/karesansui/ -type d -exec chmod g+rwx \{\} \;
 
     #### Copy several programs, configuration files and SysV init script ####
-    # cp -f  ~rpmbuild/karesansui/doc/application.conf.example /etc/karesansui/application.conf
-    # cp -f  ~rpmbuild/karesansui/doc/log.conf.example /etc/karesansui/log.conf
-    # cp -f  ~rpmbuild/karesansui/doc/service.xml.example /etc/karesansui/service.xml
-    # cp -f  ~rpmbuild/karesansui/doc/logview.xml.example /etc/karesansui/logview.xml
-    # cp -fr ~rpmbuild/karesansui/doc/template/ /etc/karesansui/template/
-    # cp -f  ~rpmbuild/karesansui/doc/cron_cleantmp.example /etc/cron.d/karesansui_cleantmp
-    # cp -f  ~rpmbuild/karesansui/doc/whitelist.conf.example /etc/pysilhouette/whitelist.conf
+    # cp -f  ~rpmbuild/karesansui/sample/application.conf.example /etc/karesansui/application.conf
+    # cp -f  ~rpmbuild/karesansui/sample/log.conf.example /etc/karesansui/log.conf
+    # cp -f  ~rpmbuild/karesansui/sample/service.xml.example /etc/karesansui/service.xml
+    # cp -f  ~rpmbuild/karesansui/sample/logview.xml.example /etc/karesansui/logview.xml
+    # cp -fr ~rpmbuild/karesansui/sample/template/ /etc/karesansui/template/
+    # cp -f  ~rpmbuild/karesansui/sample/cron_cleantmp.example /etc/cron.d/karesansui_cleantmp
+    # cp -f  ~rpmbuild/karesansui/sample/whitelist.conf.example /etc/pysilhouette/whitelist.conf
 
 
 ## Configuring pysilhouette ##
@@ -522,7 +522,7 @@ Edit _/etc/lighttpd/modules.conf_ to enable the following modules.
 
 Copy the sample configuration file bundled with the source code to the location of lighttpd config directory, and edit it if necessary.
 
-    # cp ~rpmbuild/karesansui/doc/lighttpd/karesansui.conf /etc/lighttpd/conf.d/
+    # cp ~rpmbuild/karesansui/sample/lighttpd/karesansui.conf /etc/lighttpd/conf.d/
 
 
 ####4. Setting up a simple SSL configuration with lighttpd
@@ -584,7 +584,7 @@ Add _apache_ user to _kss_ group and _kss_ user to _apache_ group.
 
 Copy the sample configuration file bundled with the source code to the location of httpd config directory, and edit it if necessary.
 
-    # cp ~rpmbuild/karesansui/doc/apache/fastcgi.conf /etc/httpd/conf.d/
+    # cp ~rpmbuild/karesansui/sample/apache/fastcgi.conf /etc/httpd/conf.d/
 
 ####4. Start web service
 
@@ -643,7 +643,7 @@ Add _nginx_ user to _kss_ group and _kss_ user to _nginx_ group.
 
 Copy the sample configuration file bundled with the source code to the location of nginx config directory, and edit it if necessary.
 
-    # cp ~rpmbuild/karesansui/doc/nginx/karesansui.conf /etc/nginx/conf.d/
+    # cp ~rpmbuild/karesansui/sample/nginx/karesansui.conf /etc/nginx/conf.d/
 
 ####4. Start web service
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,15 +8,16 @@ include README.ja
 include MANIFEST.in
 include scripts/karesansui
 recursive-include doc *
+recursive-include sample *
 recursive-include bin *
 recursive-include tool *
 recursive-include installer *
 recursive-include karesansui/locale *
 recursive-include karesansui/templates *
 recursive-include karesansui/static *
 include karesansui.spec
-prune doc/specs/collectd/
-prune doc/specs/IPAexfont
-prune doc/specs/python-webpy
-prune doc/specs/rrdtool
-prune doc/specs/tightvnc-java
+prune sample/specs/collectd/
+prune sample/specs/IPAexfont
+prune sample/specs/python-webpy
+prune sample/specs/rrdtool
+prune sample/specs/tightvnc-java
diff --git a/doc/template/en/collectd_failure_cpu.eml b/doc/template/en/collectd_failure_cpu.eml
diff --git a/doc/template/en/collectd_failure_df.eml b/doc/template/en/collectd_failure_df.eml
diff --git a/doc/template/en/collectd_failure_disk.eml b/doc/template/en/collectd_failure_disk.eml
diff --git a/doc/template/en/collectd_failure_interface.eml b/doc/template/en/collectd_failure_interface.eml
diff --git a/doc/template/en/collectd_failure_libvirt.eml b/doc/template/en/collectd_failure_libvirt.eml
diff --git a/doc/template/en/collectd_failure_load.eml b/doc/template/en/collectd_failure_load.eml
diff --git a/doc/template/en/collectd_failure_memory.eml b/doc/template/en/collectd_failure_memory.eml
diff --git a/doc/template/en/collectd_failure_uptime.eml b/doc/template/en/collectd_failure_uptime.eml
diff --git a/doc/template/en/collectd_failure_users.eml b/doc/template/en/collectd_failure_users.eml
diff --git a/doc/template/en/collectd_okay_cpu.eml b/doc/template/en/collectd_okay_cpu.eml
diff --git a/doc/template/en/collectd_okay_df.eml b/doc/template/en/collectd_okay_df.eml
diff --git a/doc/template/en/collectd_okay_disk.eml b/doc/template/en/collectd_okay_disk.eml
diff --git a/doc/template/en/collectd_okay_interface.eml b/doc/template/en/collectd_okay_interface.eml
diff --git a/doc/template/en/collectd_okay_libvirt.eml b/doc/template/en/collectd_okay_libvirt.eml
diff --git a/doc/template/en/collectd_okay_load.eml b/doc/template/en/collectd_okay_load.eml
diff --git a/doc/template/en/collectd_okay_memory.eml b/doc/template/en/collectd_okay_memory.eml
diff --git a/doc/template/en/collectd_okay_uptime.eml b/doc/template/en/collectd_okay_uptime.eml
diff --git a/doc/template/en/collectd_okay_users.eml b/doc/template/en/collectd_okay_users.eml
diff --git a/doc/template/en/collectd_warning_cpu.eml b/doc/template/en/collectd_warning_cpu.eml
diff --git a/doc/template/en/collectd_warning_df.eml b/doc/template/en/collectd_warning_df.eml
diff --git a/doc/template/en/collectd_warning_disk.eml b/doc/template/en/collectd_warning_disk.eml
diff --git a/doc/template/en/collectd_warning_interface.eml b/doc/template/en/collectd_warning_interface.eml