update wordpress example (#16)

* update wordpress example

Author: mosuke5

wordpress_sample/README.md

@@ -1,70 +1,58 @@
-# ベーシックWordPress構築サンプル
-## 概要
-ECSとRDSを利用したベーシックなWordPress環境のサンプル。  
-![wordpress](/image/architecture_wordpress_sample.png)
+# WordPress example
+This is the example of building wordpress with ECS and RDS.
+
+1. Create VPC
+1. Create Vswitch
+1. Create Security Group and set some rules
+1. Create an ECS instance in Vswitch
+1. Create EIP and bind it to ECS instance
+1. Create a RDS instance in Vswitch and create database, db user
+1. Set ECS private ip address to RDS white list 
+
+## How to use
+You can build wordpress by following process. But if you want to operate wordpress in production, you need to configure more.
 
-## 利用方法
-基本的に下記の方法で実行可能です。
 ```
-// 事前準備
-$ cd wordpress_sample // 実行したいサンプルへ移動
 $ cp terraform.tfvars.sample terraform.tfvars
 $ vim terraform.tfvars 
-  -> API KEYや公開鍵など必要情報更新
-
-// Dry-Run
-$ terraform plan -var-file="terraform.tfvars"
+  => Edit variables with your favorite editor.
 
-// クラウドへ反映
-$ terraform apply -var-file="terraform.tfvars"
-(略)
-Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
+// Deploy to Alibaba Cloud
+$ terraform apply
+...
+Apply complete! Resources: 12 added, 0 changed, 0 destroyed.
 
-// 出力にRDSへの接続アドレスとEIPのアドレスが表示されます
 Outputs:
 rds_connection_string = xxxxxxxxx.rds.aliyuncs.com
 wordpress_eip = xx.xx.xx.xx
+```
 
-// ECSへ接続
+```
+// Connect to ECS instance with ssh
 $ ssh ecs-user@xx.xx.xx.xx
 
-// WordPressの設定
+// Configure wordpress
 $ cd /var/www/html/wordpress
 $ sudo cp wp-config-sample.php wp-config.php
 $ sudo vim wp-config.php
-/** WordPress のためのデータベース名 */
 define('DB_NAME', 'database_name_here');
-
-/** MySQL データベースのユーザー名 */
 define('DB_USER', 'username_here');
-
-/** MySQL データベースのパスワード */
 define('DB_PASSWORD', 'password_here');
-
-/** MySQL のホスト名 */
 define('DB_HOST', 'localhost');
-
-
-define('AUTH_KEY',         'put your unique phrase here');
-define('SECURE_AUTH_KEY',  'put your unique phrase here');
-define('LOGGED_IN_KEY',    'put your unique phrase here');
-define('NONCE_KEY',        'put your unique phrase here');
-define('AUTH_SALT',        'put your unique phrase here');
-define('SECURE_AUTH_SALT', 'put your unique phrase here');
-define('LOGGED_IN_SALT',   'put your unique phrase here');
-define('NONCE_SALT',       'put your unique phrase here');
 ```
 
-## 利用開始
-設定が完了したらブラウザから接続してみよう。  
+After deploy and configuration to `wp-config.php`, let's access to your eip address.
+You will find wordpress installation screen.
+
 `http://<your eip address>/wordpress`
 
-## ECSへのセットアップ内容
-ECSへは下記の設定が行われます。
-- Apacheのインストール
-- PHPのインストール
-- WordPressソースコードの配置
-- `ecs-user`の作成
-  - `ecs-user`のsudoersへの追加
-  - terraform.tfvarsで指定した公開鍵の配置
-- sshdはパスワード認証、rootログインの禁止
+## Provisioning to ECS
+ECS will be provisioned for following settings by Ansible.
+
+- Install Apache
+- Install PHP
+- Deploy WordPress source code
+- Create `ecs-user`
+  - Add `ecs-user` to sudoers
+  - Add your public key to `/home/ecs-user/.ssh/authorized_keys`
+- Disable password authentication and root account login

wordpress_sample/outputs.tf

@@ -3,5 +3,5 @@ output "wordpress_eip" {
 }
 
 output "rds_connection_string" {
-    value = "${alicloud_db_instance.rds.connections.0.connection_string}"
+    value = "${alicloud_db_instance.db.connection_string}"
 }

wordpress_sample/playbook.yml

@@ -2,7 +2,7 @@
 - hosts: 127.0.0.1
   connection: local
   vars:
-    wordpress_url: "https://ja.wordpress.org/wordpress-4.8-ja.tar.gz"
+    wordpress_url: "https://wordpress.org/wordpress-4.9.6.zip"
     user_name: "ecs-user"
   tasks:
   - name: be sure httpd is installed

wordpress_sample/terraform.tf

@@ -8,20 +8,17 @@ variable "database_user_password" {}
 variable "database_name" {}
 variable "database_character" {}
 
-# Alicloud Providerの設定
 provider "alicloud" {
   access_key = "${var.access_key}"
   secret_key = "${var.secret_key}"
   region = "${var.region}"
 }
 
-# セキュリティグループの作成
 resource "alicloud_security_group" "sg" {
   name   = "terraform-sg"
   vpc_id = "${alicloud_vpc.vpc.id}"
 }
 
-# セキュリティグループのルール設定
 resource "alicloud_security_group_rule" "allow_http" {
   type              = "ingress"
   ip_protocol       = "tcp"
@@ -44,59 +41,63 @@ resource "alicloud_security_group_rule" "allow_ssh" {
   cidr_ip           = "0.0.0.0/0"
 }
 
-# VPCの作成
 resource "alicloud_vpc" "vpc" {
   name = "terraform-vpc"
-  cidr_block = "192.168.0.0/16"
+  cidr_block = "192.168.1.0/24"
 }
 
-# vswitchの作成。VPCの中に作ります。
 resource "alicloud_vswitch" "vsw" {
   vpc_id            = "${alicloud_vpc.vpc.id}"
-  cidr_block        = "192.168.1.0/24"
+  cidr_block        = "192.168.1.0/28"
   availability_zone = "${var.zone}"
 }
 
-# ECSに紐付けるEIP(グローバルIP)の作成
 resource "alicloud_eip" "eip" {
   internet_charge_type = "PayByTraffic"
 }
 
-# 作成したEIPをECSと紐付けします
 resource "alicloud_eip_association" "eip_asso" {
   allocation_id = "${alicloud_eip.eip.id}"
   instance_id   = "${alicloud_instance.web.id}"
 }
 
-# ECSの作成
 resource "alicloud_instance" "web" {
   instance_name = "terraform-ecs"
   host_name = "wordpress-ecs"
   availability_zone = "${var.zone}"
   image_id = "centos_7_3_64_40G_base_20170322.vhd"
   instance_type = "ecs.n4.small"
-  io_optimized = "optimized"
   system_disk_category = "cloud_efficiency"
   security_groups = ["${alicloud_security_group.sg.id}"]
   vswitch_id = "${alicloud_vswitch.vsw.id}"
   user_data = "#!/bin/bash\necho \"${var.publickey}\" > /tmp/publickey\n${file("provisioning.sh")}"
 }
 
-resource "alicloud_db_instance" "rds" {
-    engine = "MySQL"
-    engine_version = "5.6"
-    db_instance_class = "rds.mysql.t1.small"
-    db_instance_storage = "10"
-    db_instance_net_type = "Intranet"
-    vswitch_id = "${alicloud_vswitch.vsw.id}"
-    security_ips  = ["${alicloud_instance.web.private_ip}"]
+resource "alicloud_db_instance" "db" {
+  engine           = "MySQL"
+  engine_version   = "5.6"
+  instance_name    = "terraform-rds"
+  vswitch_id       = "${alicloud_vswitch.vsw.id}"
+  security_ips     = ["${alicloud_instance.web.private_ip}"]
+  instance_type    = "rds.mysql.t1.small"
+  instance_storage = "50"
+}
+
+resource "alicloud_db_account" "default" {
+  instance_id = "${alicloud_db_instance.db.id}"
+  name        = "${var.database_user_name}"
+  password    = "${var.database_user_password}"
+}
 
-    master_user_name = "${var.database_user_name}"
-    master_user_password = "${var.database_user_password}"
+resource "alicloud_db_account_privilege" "default" {
+  instance_id  = "${alicloud_db_instance.db.id}"
+  account_name = "${alicloud_db_account.default.name}"
+  privilege    = "ReadWrite"
+  db_names     = ["${alicloud_db_database.default.name}"]
+}
 
-    db_mappings = [{
-      db_name = "${var.database_name}"
-      character_set_name = "${var.database_character}"
-      db_description = "terraform wordpress"
-    }]
+resource "alicloud_db_database" "default" {
+  instance_id   = "${alicloud_db_instance.db.id}"
+  name          = "${var.database_name}"
+  character_set = "${var.database_character}"
 }