initial host and fqd rebranding

11 files changed, 32 insertions, 33 deletions

diff --git a/tools/conf/etc/dnsmasq.conf b/tools/conf/etc/dnsmasq.conf
index 0bf96af..e8bec3e 100644
--- a/tools/conf/etc/dnsmasq.conf
+++ b/tools/conf/etc/dnsmasq.conf
@@ -84,7 +84,7 @@ local=/ank/
 # Add domains which you want to force to an IP address here.
 # The example below send any host in double-click.net to a local
 # web-server.
-address=/hive.gnu.systems/10.0.0.4
+address=/machine.example.org/10.0.0.4
 
 # --address (and --server) work with IPv6 addresses too.
 #address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83
diff --git a/tools/conf/etc/gitweb.conf b/tools/conf/etc/gitweb.conf
index 26034fb..2f95792 100644
--- a/tools/conf/etc/gitweb.conf
+++ b/tools/conf/etc/gitweb.conf
@@ -18,5 +18,5 @@ $feature{'highlight'}{'default'} = [1];
 $feature{'pathinfo'}{'default'} = [1];
 
 our @extra_breadcrumbs = (
-      [ 'HomePage' => 'https://core.privat-network.net/' ],
+      [ 'HomePage' => 'https://machine.example.org/' ],
 );
diff --git a/tools/conf/etc/hosts.dnsmasq b/tools/conf/etc/hosts.dnsmasq
index 839863a..4d361be 100644
--- a/tools/conf/etc/hosts.dnsmasq
+++ b/tools/conf/etc/hosts.dnsmasq
@@ -15,7 +15,6 @@
 #255.255.255.255 broadcasthost
 #::1 localhost
 #fe80::1%lo0 localhost
-103.5.149.90 rt.com
 
 # Custom host records are listed here.
 
diff --git a/tools/conf/etc/nginx/sites-enabled/default.conf b/tools/conf/etc/nginx/sites-enabled/default.conf
index f7c3484..c35b0cd 100644
--- a/tools/conf/etc/nginx/sites-enabled/default.conf
+++ b/tools/conf/etc/nginx/sites-enabled/default.conf
@@ -4,12 +4,12 @@ server {
     listen 443 ssl;
 
 #    listen 80;
-    server_name c9.core;
+    server_name machine.example;
 
 #  listen [::]:443 ssl http2;
-    ssl_certificate /etc/letsencrypt/live/c9.core/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/c9.core/privkey.pem;
-    ssl_trusted_certificate /etc/letsencrypt/live/c9.core/chain.pem;
+    ssl_certificate /etc/letsencrypt/live/machine.example/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/machine.example/privkey.pem;
+    ssl_trusted_certificate /etc/letsencrypt/live/machine.example/chain.pem;
     ssl_session_timeout 1d;
     ssl_session_cache shared:SSL:50m;
     ssl_session_tickets off;
@@ -35,7 +35,7 @@ server {
     }
 
     location /doc {
-        alias /srv/www/c9-doc;
+        alias /srv/www/doc;
         index index.html;
     }
 
@@ -59,12 +59,12 @@ server {
 
     location /task {
         index index.php;
-        alias /srv/www/c9-flyspray;
+        alias /srv/www/flyspray;
         try_files $uri $uri/ index.php$is_args$args;
     }
 
     location ~  ^/task(.+\.php)$ { ### This location block was the solution
-        alias /srv/www/c9-flyspray;
+        alias /srv/www/flyspray;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_index index.php;
         try_files $uri /index.php =404;	
@@ -75,7 +75,7 @@ server {
     }
 
     location / {
-        alias /srv/www/c9-pmwiki/;
+        alias /srv/www/pmwiki/;
         index pmwiki.php;
         try_files $uri $uri/ /pmwiki.php$is_args$args;
     }
@@ -83,14 +83,14 @@ server {
 # ACME challenge
     location ^~ /.well-known {
         allow all;
-        alias /srv/www/c9-pmwiki/pub/cert/.well-known/;
+        alias /srv/www/pmwiki/pub/cert/.well-known/;
         default_type "text/plain";
         try_files $uri =404;
     }
 
 
     location ~ \.php$ {
-        alias /srv/www/c9-pmwiki;
+        alias /srv/www/pmwiki;
         index pmwiki.php;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
         fastcgi_index pmwiki.php;
diff --git a/tools/conf/etc/nginx/sites-enabled/git.localhost.conf b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf
index d114ab8..910df66 100644
--- a/tools/conf/etc/nginx/sites-enabled/git.localhost.conf
+++ b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf
@@ -1,7 +1,7 @@
 server {
     listen 443 ssl;
 
-    server_name git.localhost git.c9.core git.core.privat-network.net;
+    server_name git.localhost git.machine.example git.machine.example.org;
 
     root /srv/www/gitweb;
 
diff --git a/tools/conf/etc/nginx/sites/default.conf b/tools/conf/etc/nginx/sites/default.conf
index 1c71c44..dcb076f 100644
--- a/tools/conf/etc/nginx/sites/default.conf
+++ b/tools/conf/etc/nginx/sites/default.conf
@@ -3,7 +3,7 @@ server {
     listen 443 ssl;
     # listen [::]:443 ssl;
 
-    server_name c9.core;
+    server_name machine.example;
 
     root /srv/www/default;
 
diff --git a/tools/conf/etc/nginx/sites/drupal.conf b/tools/conf/etc/nginx/sites/drupal.conf
index 0407a6a..f79ed14 100644
--- a/tools/conf/etc/nginx/sites/drupal.conf
+++ b/tools/conf/etc/nginx/sites/drupal.conf
@@ -3,7 +3,7 @@ server {
         listen 192.168.1.254:443 ssl;
         listen 10.0.0.254:443 ssl;
 
-        server_name c9.core
+        server_name machine.example
 
         root /srv/www/default/drupal; ## <-- Your only path reference.
 
@@ -17,7 +17,7 @@ server {
         }
 
         location /doc {
-            alias /srv/www/c9-doc;
+            alias /srv/www/doc;
             autoindex on;
         }
 
diff --git a/tools/conf/etc/nginx/sites/flyspray.conf b/tools/conf/etc/nginx/sites/flyspray.conf
index 80b5530..ba174f1 100644
--- a/tools/conf/etc/nginx/sites/flyspray.conf
+++ b/tools/conf/etc/nginx/sites/flyspray.conf
@@ -3,7 +3,7 @@ server {
     listen 443 ssl;
     # listen [::]:443 ssl;
 
-    server_name c9.core;
+    server_name machine.example;
 
     root /srv/www/default/flyspray;
     index index.php;
diff --git a/tools/conf/etc/nginx/sites/laravel.conf b/tools/conf/etc/nginx/sites/laravel.conf
index e563a3e..addfd18 100644
--- a/tools/conf/etc/nginx/sites/laravel.conf
+++ b/tools/conf/etc/nginx/sites/laravel.conf
@@ -3,10 +3,10 @@ server {
     # listen [::]:443 ssl;
 
     root /srv/www/default/laravel/public;
-    server_name c9.core
+    server_name machine.example
 
-    location /c9-doc {
-        alias /srv/www/c9-doc;
+    location /doc {
+        alias /srv/www/doc;
         index index.html;
         autoindex on;
     }
diff --git a/tools/conf/etc/rc.conf b/tools/conf/etc/rc.conf
index e7c10c7..2dbf272 100644
--- a/tools/conf/etc/rc.conf
+++ b/tools/conf/etc/rc.conf
@@ -5,7 +5,7 @@
 FONT=default
 KEYMAP=dvorak
 TIMEZONE="Europe/Lisbon"
-HOSTNAME=c9
+HOSTNAME=machine
 SYSLOG=sysklogd
 SERVICES=(lo iptables wlan blan crond)
 
diff --git a/tools/conf/srv/gitolite/gitolite.conf b/tools/conf/srv/gitolite/gitolite.conf
index e7573dd..7975549 100644
--- a/tools/conf/srv/gitolite/gitolite.conf
+++ b/tools/conf/srv/gitolite/gitolite.conf
@@ -32,9 +32,9 @@ repo @mirror
 repo gitolite-admin
     RW+     =   gitolite
 
-repo c9-doc c9-ports c9-pmwiki c9-assistant
+repo doc machine-ports pmwiki assistant
     config gitweb.owner         =   "Hive Team"
-    config gitweb.category      =   "c9"
+    config gitweb.category      =   "machine"
 
 repo linux-pck
     config gitweb.owner         =   "Hive Team"
@@ -44,20 +44,20 @@ repo opt core contrib
     config gitweb.owner         =   "crux"
     config gitweb.category      =   "crux"
 
-repo c9-doc
-    config gitweb.description   =   "c9 documentation"
+repo doc
+    config gitweb.description   =   "documentation"
     option hook.post-receive     =  deploy-web-doc
 
-repo c9-ports
-    config gitweb.description   =   "c9 ports"
+repo machine-ports
+    config gitweb.description   =   "ports"
 
-repo c9-pmwiki
-    config gitweb.description   =   "c9 wiki"
+repo pmwiki
+    config gitweb.description   =   "wiki"
     option hook.post-receive     =  deploy-web-doc
 
-repo c9-assistant
+repo assistant
     config gitweb.owner         =   "Hive Team"
-    config gitweb.description   =   "c9 open assistant"
+    config gitweb.description   =   "open assistant"
 
 repo core
     config gitweb.description   =   "crux core collection"
@@ -75,6 +75,6 @@ repo linux-pck
 
 
 @secret    =   gitolite-admin
-@project   =   c9-doc c9-ports c9-pmwiki c9-assistant
+@project   =   doc machine-ports pmwiki assistant
 @project   =   core opt contrib
 @mirror    =   linux-pck