Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8463D200BB7 for ; Sun, 2 Oct 2016 01:46:28 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 833CF160AEA; Sat, 1 Oct 2016 23:46:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DCAC3160AE7 for ; Sun, 2 Oct 2016 01:46:25 +0200 (CEST) Received: (qmail 72707 invoked by uid 500); 1 Oct 2016 23:46:24 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 72044 invoked by uid 99); 1 Oct 2016 23:46:24 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Oct 2016 23:46:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F04CCEF79F; Sat, 1 Oct 2016 23:46:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lahiru@apache.org To: commits@airavata.apache.org Date: Sat, 01 Oct 2016 23:46:42 -0000 Message-Id: <6478d9c8deb9493aa6500477a79f5e8e@git.apache.org> In-Reply-To: <2f7f04cf62bf47d9812a18d9276d3009@git.apache.org> References: <2f7f04cf62bf47d9812a18d9276d3009@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/49] airavata git commit: Make pga ansible script works with aws centos archived-at: Sat, 01 Oct 2016 23:46:28 -0000 Make pga ansible script works with aws centos Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ff2e1ae1 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ff2e1ae1 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ff2e1ae1 Branch: refs/heads/lahiru/AIRAVATA-2107 Commit: ff2e1ae1311852798ad2706a4de85f490e774ec0 Parents: 2b6f220 Author: Shameera Rathnayaka Authored: Mon Aug 22 18:53:36 2016 -0400 Committer: Shameera Rathnayaka Committed: Mon Aug 22 18:53:36 2016 -0400 ---------------------------------------------------------------------- hosts | 2 +- roles/pga/handlers/main.yml | 13 ++ roles/pga/tasks/main.yml | 77 ++++--- roles/pga/templates/httpd.conf.j2 | 353 +++++++++++++++++++++++++++++++++ roles/pga/vars/main.yml | 3 +- 5 files changed, 419 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/ff2e1ae1/hosts ---------------------------------------------------------------------- diff --git a/hosts b/hosts index 4ff2de0..9fd1d8e 100644 --- a/hosts +++ b/hosts @@ -20,4 +20,4 @@ 54.85.248.150 [pga] -54.236.200.110 +54.88.152.194 http://git-wip-us.apache.org/repos/asf/airavata/blob/ff2e1ae1/roles/pga/handlers/main.yml ---------------------------------------------------------------------- diff --git a/roles/pga/handlers/main.yml b/roles/pga/handlers/main.yml new file mode 100644 index 0000000..9c6c12f --- /dev/null +++ b/roles/pga/handlers/main.yml @@ -0,0 +1,13 @@ +--- + +- name: composer update + composer: command=update working_dir="{{ doc_root_dir }}" + become: yes + +- name: start httpd + service: name=httpd state=started + become: yes + +- name: restart httpd + service: name=httpd state=restarted + become: yes http://git-wip-us.apache.org/repos/asf/airavata/blob/ff2e1ae1/roles/pga/tasks/main.yml ---------------------------------------------------------------------- diff --git a/roles/pga/tasks/main.yml b/roles/pga/tasks/main.yml index 05bca80..80beac2 100644 --- a/roles/pga/tasks/main.yml +++ b/roles/pga/tasks/main.yml @@ -10,16 +10,26 @@ - httpd - php - php-soap - - php-mcrypt - libselinux-python - - composer + - php-pdo become: yes # - name: Allow selinux outbound connection from web server # command: setsebool -P httpd_can_network_connect 1 - name: install composer - yum: name=composer state=latest update_cache=yes + shell: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + args: + creates: /usr/local/bin/composer + become: yes + +- name: install epel release + yum: name=epel-release state=present + become: yes + +# depend on epel release +- name: install mcrypt + yum: name=php-mcrypt state=latest update_cache=yes become: yes - name: Git clone php gateway @@ -27,42 +37,42 @@ dest="{{ doc_root_dir }}" version=master become: yes +- name: Create user data dir {{ user_data_dir }} + file: path="{{ user_data_dir }}" state=directory + become: yes + #Make sure selinux is dissabled in remote machine - name: Disable selinux selinux: state=disabled become: yes -- name: Run composer update - composer: command=update working_dir="{{ doc_root_dir }}" +# need to restart after disable selinux +- name: restart machine + shell: sleep 2 && shutdown -r now "Ansible updates triggered" + async: 1 + poll: 0 become: yes + ignore_errors: true -# - name: Run composer update -# command: composer update chdir="{{ doc_root_dir }}" -# become: yes +- name: waiting for server to come back + local_action: wait_for host={{ inventory_hostname }} state=started delay=30 timeout=60 -- name: Create user data dir {{ user_data_dir }} - file: path="{{ user_data_dir }}" state=directory +- name: Run composer update + composer: command=update working_dir="{{ doc_root_dir }}" + become: yes # step 6: Change pga configurations - name: Copy pga config file template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php" + become: yes +# give write permission to storage directory +- name: give read permissions to doc root + file: path="{{ doc_root_dir }}" state=directory mode=0755 recurse=yes + become: yes -# do we need to change permissions for root user? -# - name: Change storage permissions to g+rwx -# acl: name="{{ doc_root_dir }}/app/storage" entity="{{ pga_group }}" etype=group permissions="rwx" state=present - -# Ignored step 8,9 in doc by assuming selinux is dissabled in remote machine - -# TODO: stop iptables service, can't have both iptables and firewalld on same host -# - name: Stop iptables, ip6tables services -# service: name="{{ item }}" state=stopped -# with_items: -# - iptables -# - ip6tables - -- name: Start firewalld service - service: name=firewalld state=started +- name: give write permissions to storage dir + file: path="{{ doc_root_dir }}/app/storage" state=directory mode=0777 recurse=yes become: yes - name: Eanble https and http service on public zone @@ -72,5 +82,18 @@ - https become: yes -- name: Edit file - lineinfile: dest="{{ httpd_conf_file }}" regexp=^AllowOverride line="AllowOverride All" +# - name: Edit file +# lineinfile: dest="{{ httpd_conf_file }}" regexp="#\n\s*AllowOverride None" line="#\nAllowOverride All" +# notify: +# - restart httpd +# become: yes + +- name: copy httpd.conf file + template: src=httpd.conf.j2 dest="{{ httpd_conf_file_location }}/httpd.conf" + become: yes + notify: + - restart httpd + +- name: start httpd service + service: name=httpd state=started + become: yes http://git-wip-us.apache.org/repos/asf/airavata/blob/ff2e1ae1/roles/pga/templates/httpd.conf.j2 ---------------------------------------------------------------------- diff --git a/roles/pga/templates/httpd.conf.j2 b/roles/pga/templates/httpd.conf.j2 new file mode 100644 index 0000000..37c05e2 --- /dev/null +++ b/roles/pga/templates/httpd.conf.j2 @@ -0,0 +1,353 @@ +# +# This is the main Apache HTTP server configuration file. It contains the +# configuration directives that give the server its instructions. +# See for detailed information. +# In particular, see +# +# for a discussion of each configuration directive. +# +# Do NOT simply read the instructions in here without understanding +# what they do. They're here only as hints or reminders. If you are unsure +# consult the online docs. You have been warned. +# +# Configuration and logfile names: If the filenames you specify for many +# of the server's control files begin with "/" (or "drive:/" for Win32), the +# server will use that explicit path. If the filenames do *not* begin +# with "/", the value of ServerRoot is prepended -- so 'log/access_log' +# with ServerRoot set to '/www' will be interpreted by the +# server as '/www/log/access_log', where as '/log/access_log' will be +# interpreted as '/log/access_log'. + +# +# ServerRoot: The top of the directory tree under which the server's +# configuration, error, and log files are kept. +# +# Do not add a slash at the end of the directory path. If you point +# ServerRoot at a non-local disk, be sure to specify a local disk on the +# Mutex directive, if file-based mutexes are used. If you wish to share the +# same ServerRoot for multiple httpd daemons, you will need to change at +# least PidFile. +# +ServerRoot "/etc/httpd" + +# +# Listen: Allows you to bind Apache to specific IP addresses and/or +# ports, instead of the default. See also the +# directive. +# +# Change this to Listen on specific IP addresses as shown below to +# prevent Apache from glomming onto all bound IP addresses. +# +#Listen 12.34.56.78:80 +Listen 80 + +# +# Dynamic Shared Object (DSO) Support +# +# To be able to use the functionality of a module which was built as a DSO you +# have to place corresponding `LoadModule' lines at this location so the +# directives contained in it are actually available _before_ they are used. +# Statically compiled modules (those listed by `httpd -l') do not need +# to be loaded here. +# +# Example: +# LoadModule foo_module modules/mod_foo.so +# +Include conf.modules.d/*.conf + +# +# If you wish httpd to run as a different user or group, you must run +# httpd as root initially and it will switch. +# +# User/Group: The name (or #number) of the user/group to run httpd as. +# It is usually good practice to create a dedicated user and group for +# running httpd, as with most system services. +# +User apache +Group apache + +# 'Main' server configuration +# +# The directives in this section set up the values used by the 'main' +# server, which responds to any requests that aren't handled by a +# definition. These values also provide defaults for +# any containers you may define later in the file. +# +# All of these directives may appear inside containers, +# in which case these default settings will be overridden for the +# virtual host being defined. +# + +# +# ServerAdmin: Your address, where problems with the server should be +# e-mailed. This address appears on some server-generated pages, such +# as error documents. e.g. admin@your-domain.com +# +ServerAdmin root@localhost + +# +# ServerName gives the name and port that the server uses to identify itself. +# This can often be determined automatically, but we recommend you specify +# it explicitly to prevent problems during startup. +# +# If your host doesn't have a registered DNS name, enter its IP address here. +# +#ServerName www.example.com:80 + +# +# Deny access to the entirety of your server's filesystem. You must +# explicitly permit access to web content directories in other +# blocks below. +# + + AllowOverride none + Require all denied + + +# +# Note that from this point forward you must specifically allow +# particular features to be enabled - so if something's not working as +# you might expect, make sure that you have specifically enabled it +# below. +# + +# +# DocumentRoot: The directory out of which you will serve your +# documents. By default, all requests are taken from this directory, but +# symbolic links and aliases may be used to point to other locations. +# +DocumentRoot "/var/www/html" + +# +# Relax access to content within /var/www. +# + + AllowOverride None + # Allow open access: + Require all granted + + +# Further relax access to the default document root: + + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.4/mod/core.html#options + # for more information. + # + Options Indexes FollowSymLinks + + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # + AllowOverride All + + # + # Controls who can get stuff from this server. + # + Require all granted + + +# +# DirectoryIndex: sets the file that Apache will serve if a directory +# is requested. +# + + DirectoryIndex index.html + + +# +# The following lines prevent .htaccess and .htpasswd files from being +# viewed by Web clients. +# + + Require all denied + + +# +# ErrorLog: The location of the error log file. +# If you do not specify an ErrorLog directive within a +# container, error messages relating to that virtual host will be +# logged here. If you *do* define an error logfile for a +# container, that host's errors will be logged there and not here. +# +ErrorLog "logs/error_log" + +# +# LogLevel: Control the number of messages logged to the error_log. +# Possible values include: debug, info, notice, warn, error, crit, +# alert, emerg. +# +LogLevel warn + + + # + # The following directives define some format nicknames for use with + # a CustomLog directive (see below). + # + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined + LogFormat "%h %l %u %t \"%r\" %>s %b" common + + + # You need to enable mod_logio.c to use %I and %O + LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio + + + # + # The location and format of the access logfile (Common Logfile Format). + # If you do not define any access logfiles within a + # container, they will be logged here. Contrariwise, if you *do* + # define per- access logfiles, transactions will be + # logged therein and *not* in this file. + # + #CustomLog "logs/access_log" common + + # + # If you prefer a logfile with access, agent, and referer information + # (Combined Logfile Format) you can use the following directive. + # + CustomLog "logs/access_log" combined + + + + # + # Redirect: Allows you to tell clients about documents that used to + # exist in your server's namespace, but do not anymore. The client + # will make a new request for the document at its new location. + # Example: + # Redirect permanent /foo http://www.example.com/bar + + # + # Alias: Maps web paths into filesystem paths and is used to + # access content that does not live under the DocumentRoot. + # Example: + # Alias /webpath /full/filesystem/path + # + # If you include a trailing / on /webpath then the server will + # require it to be present in the URL. You will also likely + # need to provide a section to allow access to + # the filesystem path. + + # + # ScriptAlias: This controls which directories contain server scripts. + # ScriptAliases are essentially the same as Aliases, except that + # documents in the target directory are treated as applications and + # run by the server when requested rather than as documents sent to the + # client. The same rules about trailing "/" apply to ScriptAlias + # directives as to Alias. + # + ScriptAlias /cgi-bin/ "/var/www/cgi-bin/" + + + +# +# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased +# CGI directory exists, if you have that configured. +# + + AllowOverride None + Options None + Require all granted + + + + # + # TypesConfig points to the file containing the list of mappings from + # filename extension to MIME-type. + # + TypesConfig /etc/mime.types + + # + # AddType allows you to add to or override the MIME configuration + # file specified in TypesConfig for specific file types. + # + #AddType application/x-gzip .tgz + # + # AddEncoding allows you to have certain browsers uncompress + # information on the fly. Note: Not all browsers support this. + # + #AddEncoding x-compress .Z + #AddEncoding x-gzip .gz .tgz + # + # If the AddEncoding directives above are commented-out, then you + # probably should define those extensions to indicate media types: + # + AddType application/x-compress .Z + AddType application/x-gzip .gz .tgz + + # + # AddHandler allows you to map certain file extensions to "handlers": + # actions unrelated to filetype. These can be either built into the server + # or added with the Action directive (see below) + # + # To use CGI scripts outside of ScriptAliased directories: + # (You will also need to add "ExecCGI" to the "Options" directive.) + # + #AddHandler cgi-script .cgi + + # For type maps (negotiated resources): + #AddHandler type-map var + + # + # Filters allow you to process content before it is sent to the client. + # + # To parse .shtml files for server-side includes (SSI): + # (You will also need to add "Includes" to the "Options" directive.) + # + AddType text/html .shtml + AddOutputFilter INCLUDES .shtml + + +# +# Specify a default charset for all content served; this enables +# interpretation of all content as UTF-8 by default. To use the +# default browser choice (ISO-8859-1), or to allow the META tags +# in HTML content to override this choice, comment out this +# directive: +# +AddDefaultCharset UTF-8 + + + # + # The mod_mime_magic module allows the server to use various hints from the + # contents of the file itself to determine its type. The MIMEMagicFile + # directive tells the module where the hint definitions are located. + # + MIMEMagicFile conf/magic + + +# +# Customizable error responses come in three flavors: +# 1) plain text 2) local redirects 3) external redirects +# +# Some examples: +#ErrorDocument 500 "The server made a boo boo." +#ErrorDocument 404 /missing.html +#ErrorDocument 404 "/cgi-bin/missing_handler.pl" +#ErrorDocument 402 http://www.example.com/subscription_info.html +# + +# +# EnableMMAP and EnableSendfile: On systems that support it, +# memory-mapping or the sendfile syscall may be used to deliver +# files. This usually improves server performance, but must +# be turned off when serving from networked-mounted +# filesystems or if support for these functions is otherwise +# broken on your system. +# Defaults if commented: EnableMMAP On, EnableSendfile Off +# +#EnableMMAP off +EnableSendfile on + +# Supplemental configuration +# +# Load config files in the "/etc/httpd/conf.d" directory, if any. +IncludeOptional conf.d/*.conf http://git-wip-us.apache.org/repos/asf/airavata/blob/ff2e1ae1/roles/pga/vars/main.yml ---------------------------------------------------------------------- diff --git a/roles/pga/vars/main.yml b/roles/pga/vars/main.yml index 1ece511..4c1b822 100644 --- a/roles/pga/vars/main.yml +++ b/roles/pga/vars/main.yml @@ -3,7 +3,8 @@ pga_user: "pga" pga_group: "pga" doc_root_dir: "/var/www/html/php-gateway" user_data_dir: "/var/www/user_data" -httpd_conf_file: "/etc/httpd/conf/httpd.conf" +#httpd_conf_file: "/etc/httpd/conf/httpd.conf" +httpd_conf_file_location: "/etc/httpd/conf" ## WSO2 IS related variables tenant_domain: "master2.airavata"