Changeset 3656 in MondoRescue for branches

Timestamp:

Apr 26, 2017, 3:10:58 AM (7 years ago)

Author:

Bruno Cornec

Message:

More services up and runnig for the MondoRescue server

Location:

branches/3.3/ansible

Files:

• git.yml (added)
• group_vars/all (modified) (1 diff)
• handlers (added)
• handlers/main.yml (added)
• httpd.yml (modified) (1 diff)
• inventory (modified) (1 diff)
• inventory.int (modified) (1 diff)
• roles/git (added)
• roles/git/files (added)
• roles/git/files/git (added)
• roles/git/handlers (added)
• roles/git/handlers/main.yml (added)
• roles/git/tasks (added)
• roles/git/tasks/main.yml (added)
• roles/httpd/handlers (deleted)
• roles/httpd/templates/dploy.org.conf (modified) (2 diffs)
• roles/httpd/templates/mondorescue.org.conf (modified) (2 diffs)
• roles/httpd/templates/project-builder.org.conf (modified) (2 diffs)
• roles/rsync (added)
• roles/rsync/files (added)
• roles/rsync/files/rsyncd.conf (added)
• roles/rsync/handlers (added)
• roles/rsync/handlers/main.yml (added)
• roles/rsync/tasks (added)
• roles/rsync/tasks/main.yml (added)
• roles/shorewall/defaults/main.yml (modified) (3 diffs)
• roles/smtp/tasks/main.yml (modified) (1 diff)
• roles/smtp/templates/main.cf.j2 (modified) (1 diff)
• roles/svn/templates (deleted)
• roles/trac (added)
• roles/trac/files (added)
• roles/trac/files/dploy.ini (added)
• roles/trac/files/mondorescue.ini (added)
• roles/trac/files/project-builder.ini (added)
• roles/trac/files/pusk.ini (added)
• roles/trac/files/uuwl.ini (added)
• roles/trac/handlers (added)
• roles/trac/handlers/main.yml (added)
• roles/trac/meta (added)
• roles/trac/meta/main.yml.bak (added)
• roles/trac/tasks (added)
• roles/trac/tasks/main.yml (added)
• roles/trac/templates (added)
• roles/trac/templates/trac.ini (added)
• rsync.yml (added)
• site.yml (modified) (1 diff)
• svn.yml (added)
• trac.yml (added)

branches/3.3/ansible/group_vars/all

@@ -5 +5 @@
 ip_ext: 185.170.48.239
 ip_int: 10.11.7.195
+smtp: mail.hpintelco.org

branches/3.3/ansible/httpd.yml

@@ -3 +3 @@
   roles:
   - httpd
+  handlers:
+  - include: handlers/main.yml

branches/3.3/ansible/inventory

@@ -16 +16 @@
 www.mondorescue.org
 
+[trac]
+www.mondorescue.org
+
 [svn]
+www.mondorescue.org
+
+[git]
+www.mondorescue.org
+
+[rsync]
 www.mondorescue.org
 

branches/3.3/ansible/inventory.int

@@ -19 +19 @@
 mondo.hpintelco.org
 
+[trac]
+www.mondorescue.org
+
 [svn]
+mondo.hpintelco.org
+
+[git]
+mondo.hpintelco.org
+
+[rsync]
 mondo.hpintelco.org
 

branches/3.3/ansible/roles/httpd/templates/dploy.org.conf

@@ -36 +36 @@
     </Directory>
     
-    Alias /trac/ "/usr/share/trac/htdocs/"
-    <Location "/cgi-bin/trac.cgi">
-        SetEnv TRAC_ENV "/mondo/dploy/trac/dploy.env"
-    </Location>
-
     # You need something like this to authenticate users
     <Location "/cgi-bin/trac.cgi/login">
@@ -52 +47 @@
 <VirtualHost {{ ip_int }}>
     ServerName trac.dploy.org
-    SetEnv TRAC_ENV "/mondo/dploy/trac/dploy.env"
+    DefaultInitEnv TRAC_ENV "/mondo/dploy/trac/dploy.env"
     DocumentRoot /mondo/dploy/www/cgi-bin/trac.cgi
     ServerAdmin webmaster@dploy.org

branches/3.3/ansible/roles/httpd/templates/mondorescue.org.conf

@@ -46 +46 @@
     ServerName trac.mondorescue.org
     DocumentRoot /prj/www/html/mondorescue
+    DefaultInitEnv TRAC_ENV "/prj/trac/mondorescue.env"
     ServerAdmin webmaster@mondorescue.org
     CustomLog /var/log/httpd/www.mondorescue.org/access_log combined
@@ -56 +57 @@
     </Directory>
 
-    <Location "/">
-        SetEnv TRAC_ENV "/prj/trac/mondorescue.env"
-    </Location>
 
     ScriptAlias / "/var/www/cgi-bin/trac.fcgi/"

branches/3.3/ansible/roles/httpd/templates/project-builder.org.conf

@@ -43 +43 @@
     ServerName trac.project-builder.org
     DocumentRoot /prj/www/html/project-builder
+    DefaultInitEnv TRAC_ENV "/prj/trac/project-builder.env"
     ServerAdmin webmaster@project-builder.org
     CustomLog /var/log/httpd/www.project-builder.org/access_log combined
@@ -52 +53 @@
         Require all granted
     </Directory>
-
-    <Location "/">
-        SetEnv TRAC_ENV "/prj/trac/project-builder.env"
-    </Location>
 
     ScriptAlias / "/var/www/cgi-bin/trac.fcgi/"

branches/3.3/ansible/roles/shorewall/defaults/main.yml

@@ -34 +34 @@
   # Incoming HTTP
   - { action: ACCEPT, source: net, destination: fw, protocol: tcp, destination_port: 80 }
+  # Incoming RSYNC
+  - { action: ACCEPT, source: net, destination: fw, protocol: tcp, destination_port: 873 }
   # Incoming SVN
   - { action: ACCEPT, source: net, destination: fw, protocol: tcp, destination_port: 3690 }
@@ -44 +46 @@
   # Incoming PING
   - { action: ACCEPT, source: net, destination: fw, protocol: icmp, destination_port: 8 }
+  # Outgoing NTP
+  - { action: ACCEPT, source: fw, destination: net, protocol: tcp, destination_port: 123 }
+  - { action: ACCEPT, source: fw, destination: net, protocol: udp, destination_port: 123 }
   # Outgoing DNS
   - { action: ACCEPT, source: fw, destination: "net:{{ dns1 }}", protocol: udp, destination_port: 53 }
@@ -49 +54 @@
   - { action: ACCEPT, source: fw, destination: "net:{{ dns1 }}", protocol: tcp, destination_port: 53 }
   - { action: ACCEPT, source: fw, destination: "net:{{ dns2 }}", protocol: tcp, destination_port: 53 }
-  # Outgoing HTTP
+  # Outgoing HTTP/S
   - { action: ACCEPT, source: fw, destination: net, protocol: tcp, destination_port: 80 }
+  - { action: ACCEPT, source: fw, destination: net, protocol: tcp, destination_port: 443}

branches/3.3/ansible/roles/smtp/tasks/main.yml

@@ -4 +4 @@
   urpmi: name=postfix state=installed no-recommends=yes
   tags: smtp
-
-- name: DEBUG vars
-  debug: var=hostvars[inventory_hostname] #verbosity=2
-  #debug: var=vars #verbosity=2
-  #debug: var=smtp_role
-  #debug: var=smtp_server_ext
 
 - name: Copy postfix data files

branches/3.3/ansible/roles/smtp/templates/main.cf.j2

@@ -27 +27 @@
 #
 mynetworks = 127.0.0.0/8,  {{ ip_ext}}/32, {{ ip_int }}/26
+relayhost = {{ smtp }}
 mynetworks_style = host
 mydestination = $myhostname, localhost.$mydomain, localhost, svn.mondorescue.org, www.mondorescue.org, ftp.mondorescue.org, mondorescue.org, trac.mondorescue.org, svn.project-builder.org, www.project-builder.org, ftp.project-builder.org, project-builder.org, trac.project-builder.org, svn.dploy.org, www.dploy.org, ftp.dploy.org, dploy.org, trac.dploy.org
-relayhost = mail.hpintelco.org
 transport_maps = hash:/etc/postfix/transport
 #smtpd_recipient_restrictions = permit_mynetworks,reject_unauth_destination

branches/3.3/ansible/site.yml

@@ -4 +4 @@
 - include: ntp.yml
 - include: smtp.yml
-- include: httpd.yml
+- include: trac.yml
 - include: vsftpd.yml
 - include: svn.yml
+- include: git.yml
+- include: rsync.yml